用户信息表

airport-common/src/main/java/com/sundot/airport/common/core/domain/entity/SysUser.java

@@ -446,6 +446,12 @@ public class SysUser extends BaseEntity {
      */
     private List<SysUser> teamCooperationList;
 
+    /**
+     * 导入角色组
+     */
+    @Excel(name = "角色组(多个角色之间英文逗号分隔)", type = Type.IMPORT)
+    private String roleNames;
+
     public SysUser() {
 
     }
@@ -1062,6 +1068,14 @@ public class SysUser extends BaseEntity {
         this.teamCooperationList = teamCooperationList;
     }
 
+    public String getRoleNames() {
+        return roleNames;
+    }
+
+    public void setRoleNames(String roleNames) {
+        this.roleNames = roleNames;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -1139,6 +1153,7 @@ public class SysUser extends BaseEntity {
                 .append("postDesc", getPostDesc())
                 .append("workArea", getWorkArea())
                 .append("workAreaDesc", getWorkAreaDesc())
+                .append("roleNames", getRoleNames())
                 .toString();
     }
 }

airport-system/src/main/java/com/sundot/airport/system/service/impl/SysUserServiceImpl.java

@@ -580,6 +580,9 @@ public class SysUserServiceImpl implements ISysUserService {
         // 工作区域字典数据
         Map<String, String> workAreaDictDataMap = getDictDataValueKeyMap("work_area");
 
+        // 角色列表
+        List<SysRole> sysRoleList = roleMapper.selectRoleList(new SysRole());
+
         int successNum = 0;
         int failureNum = 0;
         StringBuilder successMsg = new StringBuilder();
@@ -636,6 +639,12 @@ public class SysUserServiceImpl implements ISysUserService {
                     }
                 }
 
+                List<Long> roleIdList = Collections.emptyList();
+                if (StrUtil.isNotEmpty(user.getRoleNames())) {
+                    List<String> roleNameList = Arrays.stream(user.getRoleNames().split(",")).collect(Collectors.toList());
+                    roleIdList = sysRoleList.stream().filter(sysRole -> roleNameList.contains(sysRole.getRoleName())).map(SysRole::getRoleId).distinct().collect(Collectors.toList());
+                }
+
                 // 验证是否存在这个用户
                 SysUser u = userMapper.selectUserByUserName(user.getUserName());
                 if (StringUtils.isNull(u)) {
@@ -645,6 +654,11 @@ public class SysUserServiceImpl implements ISysUserService {
                     user.setPassword(SecurityUtils.encryptPassword(password));
                     user.setCreateBy(operName);
                     userMapper.insertUser(user);
+                    // 删除+新增用户与角色关联
+                    if (CollUtil.isNotEmpty(roleIdList)) {
+                        userRoleMapper.deleteUserRoleByUserId(user.getUserId());
+                        insertUserRole(user.getUserId(), roleIdList.toArray(new Long[0]));
+                    }
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
                 } else if (isUpdateSupport) {
@@ -655,6 +669,11 @@ public class SysUserServiceImpl implements ISysUserService {
                     user.setUserId(u.getUserId());
                     user.setUpdateBy(operName);
                     userMapper.updateUser(user);
+                    // 删除+新增用户与角色关联
+                    if (CollUtil.isNotEmpty(roleIdList)) {
+                        userRoleMapper.deleteUserRoleByUserId(user.getUserId());
+                        insertUserRole(user.getUserId(), roleIdList.toArray(new Long[0]));
+                    }
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
                 } else {