后线人员修改

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

@@ -32,17 +32,17 @@ public enum RoleConstants {
 
     R01("1","admin",""),
     R02("2","初始用户","22"),
-    R17("17","部长","18,19,20,21,22"),
-    R18("18","门店长","19,20,21,22"),
+    R17("17","部长","17,18,22,23,24,25,28,29,30,31,32,38"),
+    R18("18","门店长","17,18,22,23,24,25,28,29,30,31,32,38"),
     R19("19","出单员","22"),
     R20("20","代理人","22"),
-    R21("21","团队长","19,20,22"),
+    R21("21","团队长","17,18,22,23,24,25,28,29,30,31,32,38"),
     R22("22","后线人员","22"),
-    R23("23","运营总监","22"),
-    R24("24","系统管理员","22"),
-    R25("25","人员管理","22"),
+    R23("23","运营总监","17,18,22,23,24,25,28,29,30,31,32,38"),
+    R24("24","系统管理员","17,18,22,23,24,25,28,29,30,31,32,38"),
+    R25("25","人员管理","17,18,22,23,24,25,28,29,30,31,32,38"),
     R28("28","财务专员","22"),
-    R29("29","总公司最高管理权限","22"),
+    R29("29","总公司最高管理权限","17,18,22,23,24,25,28,29,30,31,32,38"),
     R30("30","核保部门","22"),
     R31("31","总公司人事行政部","22"),
     R32("32","财务部门","22"),

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

@@ -72,6 +72,14 @@ public class SysRoleController extends BaseController {
 //    @PreAuthorize("hasAuthority('sys:role:view')")
     @GetMapping(value = "/findAll")
     public HttpResult findAll() {
+        LambdaQueryWrapper<SysRole> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(SysRole::getDelFlag,"0");
+        List<SysRole> list = sysRoleService.list(lqw);
+        return HttpResult.ok(list);
+    }
+
+    @GetMapping(value = "/findRoleByUserId")
+    public HttpResult findRoleByUserId() {
         //获取登录人员该有的角色信息
         SysUser user = getUser();
         LambdaQueryWrapper<SysRole> lqw = new LambdaQueryWrapper<>();
@@ -86,6 +94,7 @@ public class SysRoleController extends BaseController {
         return HttpResult.ok(list);
     }
 
+
 //    @PreAuthorize("hasAuthority('sys:role:view')")
     @GetMapping(value = "/findRoleMenus")
     public HttpResult findRoleMenus(@RequestParam Long roleId) {

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -472,12 +472,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 
         //角色配置
-        SysUserRole userRole = new SysUserRole();
-        userRole.setUserId(userId);
-        userRole.setRoleId(StringUtils.toLong(sysUser.getRoleId()));
-        userRole.setLastUpdateBy(sysUser.getCreateBy());
-        userRole.setLastUpdateTime(new Date());
-        sysUserRoleService.updateById(userRole);
+        SysUserRole sysUserRole = sysUserRoleService.selectByUserId(userId);
+        sysUserRole.setRoleId(StringUtils.toLong(sysUser.getRoleId()));
+        sysUserRole.setLastUpdateBy(sysUser.getCreateBy());
+        sysUserRole.setLastUpdateTime(new Date());
+        sysUserRoleService.updateById(sysUserRole);
 
         if (StringUtils.isNotEmpty(sysUser.getReferrerId())) {
             //推荐人