bonus
/
Bonus-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

部门数据权限

This commit is contained in:
sxu 2025-03-09 20:39:35 +08:00
parent bf8ac4e1bb
commit 2c1d5d7c6a
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
View File

@ -88,7 +88,7 @@ public class SysDeptServiceImpl implements ISysDeptService
dept.setDeptName(str); dept.setDeptName(str);
} }
dept.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); dept.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
dept.setDeptId(SecurityUtils.getLoginUser().getSysUser().getFirstLevelDeptId()); //dept.setDeptId(SecurityUtils.getLoginUser().getSysUser().getFirstLevelDeptId());
return deptMapper.selectDeptList(dept); return deptMapper.selectDeptList(dept);
} }

6
bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java
View File

@ -314,10 +314,10 @@ public class SysRoleServiceImpl implements ISysRoleService
// 新增角色和部门信息（数据权限） // 新增角色和部门信息（数据权限）
int roleDeptCount = insertRoleDept(role); int roleDeptCount = insertRoleDept(role);
// 删除角色与区域关联 // 删除角色与区域关联
roleAreaMapper.deleteRoleAreaByRoleId(role.getRoleId()); //roleAreaMapper.deleteRoleAreaByRoleId(role.getRoleId());
// 新增角色和区域信息（数据权限） // 新增角色和区域信息（数据权限）
int roleAreaCount = insertRoleArea(role); //int roleAreaCount = insertRoleArea(role);
return roleDeptCount + roleAreaCount; return roleDeptCount; // + roleAreaCount;
} }
/** /**

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
View File

@ -109,7 +109,7 @@ public class SysUserServiceImpl implements ISysUserService {
user.setPhonenumber(phone); user.setPhonenumber(phone);
} }
user.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); user.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
user.setDeptId(SecurityUtils.getLoginUser().getSysUser().getFirstLevelDeptId()); //user.setDeptId(SecurityUtils.getLoginUser().getSysUser().getFirstLevelDeptId());
List<SysUser> sysUsers = userMapper.selectUserList(user); List<SysUser> sysUsers = userMapper.selectUserList(user);
//transferCanteenAdminAndCustInfo(sysUsers); //安徽送变电绿智食堂用户数据转换工具 （一次性工具） //transferCanteenAdminAndCustInfo(sysUsers); //安徽送变电绿智食堂用户数据转换工具 （一次性工具）
for (SysUser sysUser : sysUsers) { for (SysUser sysUser : sysUsers) {

12
bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -66,12 +66,12 @@
ELSE ELSE
SUBSTRING_INDEX(SUBSTRING_INDEX(d.ancestors, ',', 2), ',', -1) SUBSTRING_INDEX(SUBSTRING_INDEX(d.ancestors, ',', 2), ',', -1)
END as company_id, END as company_id,
CASE -- CASE
WHEN (LENGTH(d.ancestors) - LENGTH(REPLACE(d.ancestors, ',', ''))) = 1 THEN -- WHEN (LENGTH(d.ancestors) - LENGTH(REPLACE(d.ancestors, ',', ''))) = 1 THEN
d.dept_id -- d.dept_id
ELSE -- ELSE
SUBSTRING_INDEX(SUBSTRING_INDEX(d.ancestors, ',', 3), ',', -1) -- SUBSTRING_INDEX(SUBSTRING_INDEX(d.ancestors, ',', 3), ',', -1)
END as first_level_dept_id, -- END as first_level_dept_id,
u.user_name, u.user_name,
u.nick_name, u.nick_name,
u.email, u.email,