后线人员修改

src/main/java/com/ydtech/modules/admin/constants/RoleConstants.java

@@ -8,26 +8,45 @@ import lombok.Getter;
 @Getter
 public enum RoleConstants {
 
-    R01("1", "超级管理员",""),
-    R02("2", "初始用户权限",""),
-    R17("17", "部长","42,22,19,17"),
-    R18("18","门店长",""),
-    R19("19","出单员",""),
-    R20("20","代理人",""),
-    R21("21","团队长",""),
-    R22("22","后线人员",""),
-    R23("23","运营总监",""),
-    R24("24","系统管理员",""),
-    R25("25","人员管理",""),
-    R28("28","财务专员",""),
-    R29("29","总公司最高管理权限",""),
-    R30("30","核保部门",""),
-    R31("31","总公司人事行政部",""),
-    R32("32","财务部门",""),
-    R38("38","运营管理权限",""),
-    R39("39","测试角色",""),
-    R40("40","cc",""),
-    R42("42","机构管理员","42,22,19");
+//    R01("1", "超级管理员",""),
+//    R02("2", "初始用户权限",""),
+//    R17("17", "部长","42,22,19,17"),
+//    R18("18","门店长",""),
+//    R19("19","出单员",""),
+//    R20("20","代理人",""),
+//    R21("21","团队长",""),
+//    R22("22","后线人员",""),
+//    R23("23","运营总监",""),
+//    R24("24","系统管理员",""),
+//    R25("25","人员管理",""),
+//    R28("28","财务专员",""),
+//    R29("29","总公司最高管理权限",""),
+//    R30("30","核保部门",""),
+//    R31("31","总公司人事行政部",""),
+//    R32("32","财务部门",""),
+//    R38("38","运营管理权限",""),
+//    R39("39","测试角色",""),
+//    R40("40","cc",""),
+//    R42("42","机构管理员","42,22,19");
+
+
+    R01("1","admin",""),
+    R02("2","初始用户","22"),
+    R17("17","部长","18,19,20,21,22"),
+    R18("18","门店长","19,20,21,22"),
+    R19("19","出单员","22"),
+    R20("20","代理人","22"),
+    R21("21","团队长","19,20,22"),
+    R22("22","后线人员","22"),
+    R23("23","运营总监","22"),
+    R24("24","系统管理员","22"),
+    R25("25","人员管理","22"),
+    R28("28","财务专员","22"),
+    R29("29","总公司最高管理权限","22"),
+    R30("30","核保部门","22"),
+    R31("31","总公司人事行政部","22"),
+    R32("32","财务部门","22"),
+    R38("38","运营管理权限","22");
 
     private final String code;
     private final String name;

src/main/java/com/ydtech/modules/admin/controller/SysRoleController.java

@@ -78,13 +78,12 @@ public class SysRoleController extends BaseController {
         //获取角色的配置信息
         RoleConstants roleConstants = RoleConstants.getRoleConstants(user.getRoleId());
         if(!"".equals(roleConstants.getRoleIds())){
-            lqw.in(SysRole::getId,RoleConstants.R42.getRoleIds().split(","));
+            lqw.in(SysRole::getId,roleConstants.getRoleIds().split(","));
         }
 
         lqw.eq(SysRole::getDelFlag,"0");
         List<SysRole> list = sysRoleService.list(lqw);
         return HttpResult.ok(list);
-//        return HttpResult.ok(sysRoleService.selectAll());
     }
 
 //    @PreAuthorize("hasAuthority('sys:role:view')")

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -369,23 +369,19 @@ public class SysUserController extends BaseController {
     public HttpResult<PageVo<SysUserBaseVO>> findPage(@RequestBody PageDto<SysUserDto> pageDto) {
         //获取用户角色
         SysUser user = getUser();
-        List<String> roleIds = new ArrayList<String>();
-        //机构管理员
-        roleIds.add(RoleConstants.R42.getCode());
-        //后线人员
-        roleIds.add(RoleConstants.R22.getCode());
-        if(RoleConstants.R01.getCode().equals(user.getRoleId()) ||
-                RoleConstants.R01.getCode().equals(user.getRoleId())){
-            //部长
-            roleIds.add(RoleConstants.R17.getCode());
-        }
-        pageDto.getDto().setRoleId(String.join(",",roleIds));
+        //如果查询后线人员
+        if(RoleConstants.R22.getCode().equals(pageDto.getDto().getRoleId())){
+            if(RoleConstants.R17.getCode().equals(user.getRoleId())){
+                pageDto.getDto().setRoleId("18,22");
+            }else if(RoleConstants.R18.getCode().equals(user.getRoleId())){
+                pageDto.getDto().setRoleId("22");
+            }
+        }
         //设置登录用户的部门
-        if("".equals(pageDto.getDto().getDeptId())) {
+        if("".equals(pageDto.getDto().getDeptId()) || null == pageDto.getDto().getDeptId()){
             pageDto.getDto().setDeptId(user.getDeptId());
         }
         return HttpResult.ok(sysUserService.gainUserPage(pageDto));
-
     }
 
 
@@ -744,7 +740,7 @@ public class SysUserController extends BaseController {
                 if (deptLevel != 5) {
                     throw new SystemException("后线人员只能归属业务部门中");
                 }
-            } else if (RoleConstants.R42.getCode().equals(sysUser.getRoleId())){ // 42 机构管理员
+            } else if (RoleConstants.R18.getCode().equals(sysUser.getRoleId())){ // 42 门店长
                 if(deptLevel != 5){
                     throw new SystemException("机构管理员只能归属机构中");
                 }