diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java index cb57737..be64605 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java @@ -88,7 +88,7 @@ public class SysDeptServiceImpl implements ISysDeptService dept.setDeptName(str); } dept.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); - dept.setDeptId(SecurityUtils.getLoginUser().getSysUser().getFirstLevelDeptId()); + //dept.setDeptId(SecurityUtils.getLoginUser().getSysUser().getFirstLevelDeptId()); return deptMapper.selectDeptList(dept); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java index 9c4d4b1..f42a517 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java @@ -314,10 +314,10 @@ public class SysRoleServiceImpl implements ISysRoleService // 新增角色和部门信息(数据权限) int roleDeptCount = insertRoleDept(role); // 删除角色与区域关联 - roleAreaMapper.deleteRoleAreaByRoleId(role.getRoleId()); + //roleAreaMapper.deleteRoleAreaByRoleId(role.getRoleId()); // 新增角色和区域信息(数据权限) - int roleAreaCount = insertRoleArea(role); - return roleDeptCount + roleAreaCount; + //int roleAreaCount = insertRoleArea(role); + return roleDeptCount; // + roleAreaCount; } /** diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java index b12abee..56939d1 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java @@ -109,7 +109,7 @@ public class SysUserServiceImpl implements ISysUserService { user.setPhonenumber(phone); } user.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); - user.setDeptId(SecurityUtils.getLoginUser().getSysUser().getFirstLevelDeptId()); + //user.setDeptId(SecurityUtils.getLoginUser().getSysUser().getFirstLevelDeptId()); List sysUsers = userMapper.selectUserList(user); //transferCanteenAdminAndCustInfo(sysUsers); //安徽送变电绿智食堂用户数据转换工具 (一次性工具) for (SysUser sysUser : sysUsers) { diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml index ff785e9..f02f7a3 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -66,12 +66,12 @@ ELSE SUBSTRING_INDEX(SUBSTRING_INDEX(d.ancestors, ',', 2), ',', -1) END as company_id, - CASE - WHEN (LENGTH(d.ancestors) - LENGTH(REPLACE(d.ancestors, ',', ''))) = 1 THEN - d.dept_id - ELSE - SUBSTRING_INDEX(SUBSTRING_INDEX(d.ancestors, ',', 3), ',', -1) - END as first_level_dept_id, +-- CASE +-- WHEN (LENGTH(d.ancestors) - LENGTH(REPLACE(d.ancestors, ',', ''))) = 1 THEN +-- d.dept_id +-- ELSE +-- SUBSTRING_INDEX(SUBSTRING_INDEX(d.ancestors, ',', 3), ',', -1) +-- END as first_level_dept_id, u.user_name, u.nick_name, u.email,