|
@@ -1,6 +1,13 @@
|
|
-package org.jeecg.modules.system.service.impl;
|
|
|
|
|
|
+package cn.com.ctop.common.module.service.impl;
|
|
|
|
|
|
|
|
+import cn.com.ctop.common.module.entity.*;
|
|
|
|
+import cn.com.ctop.common.module.mapper.*;
|
|
|
|
+import cn.com.ctop.common.module.model.DepartIdModel;
|
|
|
|
+import cn.com.ctop.common.module.model.SysDepartTreeModel;
|
|
|
|
+import cn.com.ctop.common.module.service.ISysDepartRoleService;
|
|
|
|
+import cn.com.ctop.common.module.service.ISysDepartService;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
|
|
+import cn.com.ctop.common.module.utils.FindsDepartsChildrenUtil;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
@@ -8,12 +15,6 @@ import io.netty.util.internal.StringUtil;
|
|
import org.jeecg.common.constant.CacheConstant;
|
|
import org.jeecg.common.constant.CacheConstant;
|
|
import org.jeecg.common.constant.CommonConstant;
|
|
import org.jeecg.common.constant.CommonConstant;
|
|
import org.jeecg.common.util.YouBianCodeUtil;
|
|
import org.jeecg.common.util.YouBianCodeUtil;
|
|
-import org.jeecg.modules.system.entity.*;
|
|
|
|
-import org.jeecg.modules.system.mapper.*;
|
|
|
|
-import org.jeecg.modules.system.model.DepartIdModel;
|
|
|
|
-import org.jeecg.modules.system.model.SysDepartTreeModel;
|
|
|
|
-import org.jeecg.modules.system.service.ISysDepartService;
|
|
|
|
-import org.jeecg.modules.system.util.FindsDepartsChildrenUtil;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.cache.annotation.Cacheable;
|
|
import org.springframework.cache.annotation.Cacheable;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -35,8 +36,8 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
|
|
|
|
|
|
@Resource
|
|
@Resource
|
|
private SysUserDepartMapper userDepartMapper;
|
|
private SysUserDepartMapper userDepartMapper;
|
|
- @Resource
|
|
|
|
- private SysDepartRoleMapper sysDepartRoleMapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private ISysDepartRoleService sysDepartRoleService;
|
|
@Resource
|
|
@Resource
|
|
private SysDepartPermissionMapper departPermissionMapper;
|
|
private SysDepartPermissionMapper departPermissionMapper;
|
|
@Resource
|
|
@Resource
|
|
@@ -227,7 +228,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
|
|
List<String> roleIdList = new ArrayList<>();
|
|
List<String> roleIdList = new ArrayList<>();
|
|
LambdaQueryWrapper<SysDepartRole> query = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<SysDepartRole> query = new LambdaQueryWrapper<>();
|
|
query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList);
|
|
query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList);
|
|
- List<SysDepartRole> depRoleList = sysDepartRoleMapper.selectList(query);
|
|
|
|
|
|
+ List<SysDepartRole> depRoleList = sysDepartRoleService.list(query);
|
|
for (SysDepartRole deptRole : depRoleList) {
|
|
for (SysDepartRole deptRole : depRoleList) {
|
|
roleIdList.add(deptRole.getId());
|
|
roleIdList.add(deptRole.getId());
|
|
}
|
|
}
|
|
@@ -236,7 +237,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
|
|
//根据部门id删除部门授权
|
|
//根据部门id删除部门授权
|
|
departPermissionMapper.delete(new LambdaQueryWrapper<SysDepartPermission>().in(SysDepartPermission::getDepartId, idList));
|
|
departPermissionMapper.delete(new LambdaQueryWrapper<SysDepartPermission>().in(SysDepartPermission::getDepartId, idList));
|
|
//根据部门id删除部门角色
|
|
//根据部门id删除部门角色
|
|
- sysDepartRoleMapper.delete(new LambdaQueryWrapper<SysDepartRole>().in(SysDepartRole::getDepartId, idList));
|
|
|
|
|
|
+ sysDepartRoleService.remove(new LambdaQueryWrapper<SysDepartRole>().in(SysDepartRole::getDepartId, idList));
|
|
if (roleIdList != null && roleIdList.size() > 0) {
|
|
if (roleIdList != null && roleIdList.size() > 0) {
|
|
//根据角色id删除部门角色授权
|
|
//根据角色id删除部门角色授权
|
|
departRolePermissionMapper.delete(new LambdaQueryWrapper<SysDepartRolePermission>().in(SysDepartRolePermission::getRoleId, roleIdList));
|
|
departRolePermissionMapper.delete(new LambdaQueryWrapper<SysDepartRolePermission>().in(SysDepartRolePermission::getRoleId, roleIdList));
|
|
@@ -311,7 +312,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
|
|
List<String> roleIdList = new ArrayList<>();
|
|
List<String> roleIdList = new ArrayList<>();
|
|
LambdaQueryWrapper<SysDepartRole> query = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<SysDepartRole> query = new LambdaQueryWrapper<>();
|
|
query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList);
|
|
query.select(SysDepartRole::getId).in(SysDepartRole::getDepartId, idList);
|
|
- List<SysDepartRole> depRoleList = sysDepartRoleMapper.selectList(query);
|
|
|
|
|
|
+ List<SysDepartRole> depRoleList = sysDepartRoleService.list(query);
|
|
for (SysDepartRole deptRole : depRoleList) {
|
|
for (SysDepartRole deptRole : depRoleList) {
|
|
roleIdList.add(deptRole.getId());
|
|
roleIdList.add(deptRole.getId());
|
|
}
|
|
}
|
|
@@ -320,7 +321,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
|
|
//根据部门id删除部门授权
|
|
//根据部门id删除部门授权
|
|
departPermissionMapper.delete(new LambdaQueryWrapper<SysDepartPermission>().in(SysDepartPermission::getDepartId, idList));
|
|
departPermissionMapper.delete(new LambdaQueryWrapper<SysDepartPermission>().in(SysDepartPermission::getDepartId, idList));
|
|
//根据部门id删除部门角色
|
|
//根据部门id删除部门角色
|
|
- sysDepartRoleMapper.delete(new LambdaQueryWrapper<SysDepartRole>().in(SysDepartRole::getDepartId, idList));
|
|
|
|
|
|
+ sysDepartRoleService.remove(new LambdaQueryWrapper<SysDepartRole>().in(SysDepartRole::getDepartId, idList));
|
|
if (roleIdList != null && roleIdList.size() > 0) {
|
|
if (roleIdList != null && roleIdList.size() > 0) {
|
|
//根据角色id删除部门角色授权
|
|
//根据角色id删除部门角色授权
|
|
departRolePermissionMapper.delete(new LambdaQueryWrapper<SysDepartRolePermission>().in(SysDepartRolePermission::getRoleId, roleIdList));
|
|
departRolePermissionMapper.delete(new LambdaQueryWrapper<SysDepartRolePermission>().in(SysDepartRolePermission::getRoleId, roleIdList));
|