diff --git a/base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java b/base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java
index 335dc209db5843718f513e73c95d9221ece3496a..dcae307a9ab55f946b3d82be3c96ffe01506b7d9 100644
--- a/base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java
+++ b/base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java
@@ -123,6 +123,29 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
         this.doHandlerUser(entity);
     }
 
+    @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());
+            List<Long> idList = Arrays.asList(entity.getRoleIds().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
+            roleUserQuery.setRoleIdList(idList);
+            roleUserService.doDistributionRole(roleUserQuery);
+        }
+    }
+
     @Override
     protected UserEntity findBefore(UserEntity params, Context context) throws AppException {
 //        if (StringUtils.isNotEmpty(params.getDeptIds())) {
diff --git a/base-manager/src/main/java/com/mortals/xhx/base/system/user/web/UserController.java b/base-manager/src/main/java/com/mortals/xhx/base/system/user/web/UserController.java
index bfae4fa4652f4f7219c74954f927189caab0aef0..3810d1d4f93267a35376f72e399b0f2895f33e2f 100644
--- a/base-manager/src/main/java/com/mortals/xhx/base/system/user/web/UserController.java
+++ b/base-manager/src/main/java/com/mortals/xhx/base/system/user/web/UserController.java
@@ -59,13 +59,13 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
         }
     }
 
-    @Override
+/*    @Override
     protected void saveBefore(UserEntity entity, Map<String, Object> model, Context context) throws AppException {
         if (!ObjectUtils.isEmpty(entity.getLoginName())&&service.existUser(entity.getLoginName(), entity.getId())) {
             throw new AppException("鐧诲綍鍚嶅凡瀛樺湪锛�");
         }
         super.saveBefore(entity, model, context);
-    }
+    }*/
 
 
     @RequestMapping(value = "change/password", method = RequestMethod.POST)