更新代码

src/main/java/org/rcisoft/sys/role/dao/SysRoleRepository.java

@@ -29,7 +29,7 @@ public interface SysRoleRepository extends BaseMapper<SysRole> {
      */
     @Select("<script>select * from tm_admin_role " +
             "where r_status = 1 " +
-            "and r_name not in ('主管理员','子管理员') " +
+            "and r_name not in ('超级管理员') " +
             "and corp_id = #{corpId} " +
             " order by r_name desc </script>")
     @ResultMap(value = "SelectAllAndUserNum")

src/main/java/org/rcisoft/sys/user/controller/SysUserController.java

@@ -38,9 +38,7 @@ import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * Created by Andrew on 2017/7/6.
@@ -96,10 +94,13 @@ public class SysUserController extends PaginationController<SysUser> {
     @PostMapping(value = "/AssignRoles")
     public Result AssignRoles(CurUser curUser, @Valid String id, BindingResult br,String roleId) {
         int line = userServiceImpl.AssignRoles(id,roleId);
+        Map<String,String> map = new HashMap<>();
+        map.put("roleIds",roleId);
+        map.put("userIds",id);
         return Result.builder(new PersistModel(line),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
-                id);
+                map);
     }
 
 //    @ApiOperation(value = "703 删除用户", notes = "删除用户")

src/main/java/org/rcisoft/sys/user/service/impl/SysUserServiceImpl.java

@@ -89,7 +89,7 @@ public class SysUserServiceImpl implements SysUserService {
             }
         }
         //部门不为空时 部门条件过滤
-        if (dto.getDept() != null ) {
+        if (dto.getDept() != null) {
             List<SysUser> usersForDept = new ArrayList<>();
             for (SysUser user : users) {
                 if (user.getDepart().equals(dto.getDept())) {
@@ -114,31 +114,35 @@ public class SysUserServiceImpl implements SysUserService {
 
     @Override
     public int AssignRoles(String userId, String roleId) {
-        List<String> adminRoleName = asList("主管理员", "子管理员");
+
+        List<String> adminRoleName = asList("超级管理员");
+        //查询超级管理员角色的userid
         List<String> adminIds = sysUserMapper.adminId(adminRoleName);
+        //将超级管理员人员userid 从String[]中剔除
         if (adminIds.size() != 0) {
             for (int i = 0; i < adminIds.size(); i++) {
                 userId = userId.replace(adminIds.get(i), "");
             }
-            List<String> userIds = asList(StringUtils.split(userId, ","));
-            List<String> roleIds = asList(StringUtils.split(roleId, ","));
-            List<UserRole> userRoles = new ArrayList<>();
-            sysUserMapper.delUserRoleById(userIds);
-            int result = 0;
-            for (int i = 0; i < roleIds.size(); i++) {
-                for (int j = 0; j < userIds.size(); j++) {
-                    UserRole userRole = new UserRole();
-                    userRole.setUserId(userIds.get(j));
-                    userRole.setRoleId(roleIds.get(i));
-                    UserUtil.setCurrentPersistOperation(userRole);
-                    userRoles.add(userRole);
-                }
+        }
+        List<String> userIds = asList(StringUtils.split(userId, ","));
+        List<String> roleIds = asList(StringUtils.split(roleId, ","));
+        List<UserRole> userRoles = new ArrayList<>();
+        //清空userrole中关于ids的所有数据
+        sysUserMapper.delUserRoleById(userIds);
+
+        int result = 0;
+
+        for (int i = 0; i < roleIds.size(); i++) {
+            for (int j = 0; j < userIds.size(); j++) {
+                UserRole userRole = new UserRole();
+                userRole.setUserId(userIds.get(j));
+                userRole.setRoleId(roleIds.get(i));
+                UserUtil.setCurrentPersistOperation(userRole);
+                userRoles.add(userRole);
             }
-            result = sysUserMapper.insertUserRoleById(userRoles);
-
-            return result;
         }
-        return 0;
+        result = sysUserMapper.insertUserRoleById(userRoles);
+        return result;
     }
 
     @Override