修改人员同步

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

@@ -88,6 +88,11 @@ public class UserSyncTaskImpl implements ITaskExcuteService {
                     UserEntity userEntity = userService.selectOne(userQuery);
                     if (!ObjectUtils.isEmpty(userEntity)) {
                         updateDefaultDept(userEntity);
+
+                        if(!user.getType().equals(userEntity.getUserType())){
+                            updateRoleUser(user, userEntity);
+                        }
+
                         userEntity.setLoginName(user.getAccount());
                         userEntity.setRealName(user.getUser_name());
                         userEntity.setMobile(user.getMobile());
@@ -98,9 +103,7 @@ public class UserSyncTaskImpl implements ITaskExcuteService {
                         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());