修改用户同步接口

device-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java

@@ -102,19 +102,21 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
         //更新不更新密码字段
         entity.setLoginPwd(null);
         this.doHandlerUser(entity);
-        //更新角色
-        if (entity.getId().longValue() != SysConstains.ADMIN_ID && !ObjectUtils.isEmpty(entity.getRoleIds())) {
-            RoleUserQuery roleUserQuery = new RoleUserQuery();
-            roleUserQuery.setUserId(entity.getId());
-            List<Long> idList = Arrays.asList(entity.getRoleIds().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
-            roleUserQuery.setRoleIdList(idList);
-            roleUserService.doDistributionRole(roleUserQuery);
-        }
     }
 
     @Override
     protected void saveAfter(UserEntity entity, Context context) throws AppException {
         //新增角色
+        updateUserRole(entity);
+        super.saveAfter(entity, context);
+    }
+    @Override
+    protected void updateAfter(UserEntity entity, Context context) throws AppException {
+        updateUserRole(entity);
+        super.updateAfter(entity, context);
+    }
+
+    private void updateUserRole(UserEntity entity) {
         if (!ObjectUtils.isEmpty(entity.getId()) && entity.getId().longValue() != SysConstains.ADMIN_ID && !ObjectUtils.isEmpty(entity.getRoleIds())) {
             RoleUserQuery roleUserQuery = new RoleUserQuery();
             roleUserQuery.setUserId(entity.getId());
@@ -122,7 +124,6 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
             roleUserQuery.setRoleIdList(idList);
             roleUserService.doDistributionRole(roleUserQuery);
         }
-        super.saveAfter(entity, context);
     }
 
     @Override
@@ -351,6 +352,11 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
                     log.info("需要新增用户数量：{}", saveUpdateCollect.get(true).size());
                     saveUpdateCollect.get(true).stream().forEach(item -> {
                         this.getUserDao().insert(item);
+                        //更新默认用户角色
+                        RoleUserQuery roleUserQuery = new RoleUserQuery();
+                        roleUserQuery.setUserId(item.getId());
+                        roleUserQuery.setRoleIdList(Arrays.asList(1L));
+                        roleUserService.doDistributionRole(roleUserQuery);
                     });
                 }
 
@@ -359,14 +365,8 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
                     log.info("需要更新用户数量：{}", saveUpdateCollect.get(false).size());
                     saveUpdateCollect.get(false).stream().forEach(item -> {
                         this.getUserDao().update(item);
-                        //更新默认用户角色
-                        RoleUserQuery roleUserQuery = new RoleUserQuery();
-                        roleUserQuery.setUserId(item.getId());
-                        roleUserQuery.setRoleIdList( Arrays.asList(1L));
-                        roleUserService.doDistributionRole(roleUserQuery);
                     });
                 }
-
             }
             //查找新增 与更新
         }