北京员工新增北京角色

zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/service/user/AdminUserServiceImpl.java

@@ -62,6 +62,16 @@ public class AdminUserServiceImpl implements AdminUserService {
     @Value("${sys.user.init-password:123456}")
     private String userInitPassword;
 
+    @Value("${roleId.bj}")
+    private Long bjRoleId;
+
+    @Value("${roleId.normal}")
+    private Long normalRoleId;
+
+    @Value("${deptId.beijing}")
+    private String bjDeptId;
+
+
     @Resource
     private AdminUserMapper userMapper;
 
@@ -594,10 +604,17 @@ public class AdminUserServiceImpl implements AdminUserService {
         userDept.setUserId(userId);
         userDept.setDeptId(dto.getDeptId());
         updateUserDept(userDept);
+        
 
+        //员工角色新增  如果是北京的就给北京的角色
+        Set<Long> roleIds;
+        List<String> deptIds = Arrays.asList(bjDeptId.split(","));
+        if(deptIds.contains(dto.getDeptId())){
+             roleIds= asSet(bjRoleId); //角色全部默认为北京员工
+        }else {
+            roleIds=asSet(normalRoleId); //默认为普通员工
+        }
 
-        //员工角色新增
-        Set<Long> roleIds = asSet(2L); //角色全部默认为普通员工
         permissionService.assignUserRole(userId, roleIds);
 
         return userId;
@@ -640,10 +657,10 @@ public class AdminUserServiceImpl implements AdminUserService {
     public AdminUserDO getNextLeader(String id) {
         AdminUserDO adminUserDO = userMapper.selectById(id);
         DeptDO dept = deptService.getDept(adminUserDO.getDeptId());
-        if(dept.getLeaderUserId().equals(id)){
+        if (dept.getLeaderUserId().equals(id)) {
             DeptLeaderDO deptLeader = deptLeaderService.getDeptLeaderByDeptId(dept.getId());
             return userMapper.selectById(deptLeader.getUserId());
-        }else {
+        } else {
             return userMapper.selectById(dept.getLeaderUserId());
         }
     }