kaiyu
2021-06-24 eb51b2364e9a3fbe806fde61fa255660a098fc8b
screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
@@ -2,6 +2,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -80,21 +81,22 @@
    }
    @Override
    public void deleteGroup(Group group) {
    public void deleteGroup(Integer id) {
        //逻辑删除group
        group.setIsDelete(Constants.DELETE);
        groupMapper.updateById(group);
        UpdateWrapper<Group> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("id", id).set("is_delete", Constants.DELETE);
        groupMapper.update(null, updateWrapper);
        //删除group_menu
        UpdateWrapper<GroupMenu> deleteGroupWrapper = new UpdateWrapper<>();
        deleteGroupWrapper.eq("group_id", group.getId());
        deleteGroupWrapper.eq("group_id", id);
        groupMenuMapper.delete(deleteGroupWrapper);
        //删除user_group
        UpdateWrapper<UserGroup> deleteUserGroupWrapper = new UpdateWrapper<>();
        deleteUserGroupWrapper.eq("group_id", group.getId());
        deleteUserGroupWrapper.eq("group_id", id);
        userGroupMapper.delete(deleteUserGroupWrapper);
        //日志
        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
        String content = "删除了组:" + group.getGroupName();
        String content = "删除了组:" + groupMapper.selectById(id).getGroupName();
        operationLogUtils.insertLog(request, content, Constants.DELETE_OPERATE_TYPE);
    }
@@ -136,7 +138,8 @@
        Integer orgId = (Integer) orgInfo.get("id");
        QueryWrapper<Group> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("organization_id", orgId)
                .eq("is_delete", Constants.NOT_DELETE);
                .eq("is_delete", Constants.NOT_DELETE)
                .ne("group_name", "admin");
        Object order = parameters.get("order");
        Object orderType = parameters.get("orderType");
        Object groupName = parameters.get("groupName");
@@ -145,18 +148,9 @@
            queryWrapper.like("group_name", groupName);
        }
        //分页参数
        if (!parameters.containsKey("page")) {
            parameters.put("page", 0);
        }
        if (!parameters.containsKey("size")) {
            parameters.put("size", 10);
        }
        int page = Integer.parseInt(parameters.get("page").toString());
        int size = Integer.parseInt(parameters.get("size").toString());
        Page<Group> pageData = new Page<>(page, size);
        //排序参数,默认id升序
        //排序参数,默认create_time降序
        if (order != null && orderType != null) {
            if (Constants.ORDER_ASC.equals(orderType)) {
@@ -171,4 +165,10 @@
        return pageData;
    }
    @Override
    public List<Map<String, Object>> getGroupIds(Integer userId) {
        Map<String, Object> params = new HashMap<>();
        params.put("userId", userId);
        return groupMapper.selectUserGroup(params);
    }
}