修改人员同步

study-manager/src/main/java/com/mortals/xhx/daemon/task/UserSyncTaskImpl.java

@@ -96,22 +96,15 @@ public class UserSyncTaskImpl implements ITaskExcuteService {
                         userEntity.setUpdateUserId(1L);
                         userEntity.setUpdateTime(new Date());
                         userService.update(userEntity);
+
+                        //判断角色是否更新，如果更新了 则更新角色权限
+                        if(!user.getType().equals(userEntity.getUserType())){
+                            updateRoleUser(user, userEntity);
+                        }
                     } else {
                         //新增用户
                         userEntity = userService.createUser(null, user.getId(), "", user.getAccount(), user.getPassword(), user.getUser_name(), user.getMobile());
-                        if(UserType.WORK.getValue()==user.getType()){
-                            //根据用户类型添加默认访问权限
-                            RoleUserQuery roleUserQuery = new RoleUserQuery();
-                            roleUserQuery.setUserId(userEntity.getId());
-                            roleUserQuery.setRoleIdList(Arrays.asList(new Long[]{3L}));
-                            roleUserService.doDistributionRole(roleUserQuery);
-                        }else if (UserType.WORK_PERSON.getValue()==user.getType()){
-                            //根据用户类型添加默认访问权限
-                            RoleUserQuery roleUserQuery = new RoleUserQuery();
-                            roleUserQuery.setUserId(userEntity.getId());
-                            roleUserQuery.setRoleIdList(Arrays.asList(new Long[]{2L}));
-                            roleUserService.doDistributionRole(roleUserQuery);
-                        }
+                        updateRoleUser(user, userEntity);
                     }
                 }
 
@@ -122,6 +115,22 @@ public class UserSyncTaskImpl implements ITaskExcuteService {
         }
     }
 
+    private void updateRoleUser(CustomerInfoPdu user, UserEntity userEntity) {
+        if(UserType.WORK.getValue()== user.getType()){
+            //根据用户类型添加默认访问权限
+            RoleUserQuery roleUserQuery = new RoleUserQuery();
+            roleUserQuery.setUserId(userEntity.getId());
+            roleUserQuery.setRoleIdList(Arrays.asList(new Long[]{3L}));
+            roleUserService.doDistributionRole(roleUserQuery);
+        }else if (UserType.WORK_PERSON.getValue()== user.getType()){
+            //根据用户类型添加默认访问权限
+            RoleUserQuery roleUserQuery = new RoleUserQuery();
+            roleUserQuery.setUserId(userEntity.getId());
+            roleUserQuery.setRoleIdList(Arrays.asList(new Long[]{2L}));
+            roleUserService.doDistributionRole(roleUserQuery);
+        }
+    }
+
     private void updateDefaultDept(UserEntity userEntity) {
         if(ObjectUtils.isEmpty(userEntity.getDeptId())){
             //没有部门 默认添加一个