用户导出导入修改

base-common/src/main/java/com/ozs/common/core/domain/entity/SysUser.java

@@ -44,9 +44,9 @@ public class SysUser extends BaseEntity {
     private String userName;
 
     /**
-     * 用户昵称
+     * 真实姓名
      */
-    @Excel(name = "用户名称")
+    @Excel(name = "真实姓名")
     private String nickName;
 
     /**
@@ -135,6 +135,11 @@ public class SysUser extends BaseEntity {
     /** 部门名称 */
     @TableField(exist = false)
     private String deptName;
+    
+    /** 角色名称 */
+    @TableField(exist = false)
+    @Excel(name = "角色名称")
+    private String roleName;
 
     public Integer getDataPermission() {
         return dataPermission;
@@ -148,6 +153,14 @@ public class SysUser extends BaseEntity {
 
     }
 
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
     public String getDeptName() {
         return deptName;
     }
@@ -192,8 +205,8 @@ public class SysUser extends BaseEntity {
         this.deptId = deptId;
     }
 
-    @Xss(message = "用户昵称不能包含脚本字符")
-    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
+    @Xss(message = "真实姓名不能包含脚本字符")
+    @Size(min = 0, max = 30, message = "真实姓名长度不能超过30个字符")
     public String getNickName() {
         return nickName;
     }
@@ -355,6 +368,7 @@ public class SysUser extends BaseEntity {
                 .append("dept", getDept())
                 .append("dataPermission", getDataPermission())
                 .append("deptName",getDeptName())
+                .append("roleName",getRoleName())
                 .toString();
     }
 }

base-common/src/main/java/com/ozs/common/core/domain/entity/SysUserUpdate.java

@@ -34,7 +34,7 @@ public class SysUserUpdate extends BaseEntity {
     private String userName;
 
     /**
-     * 用户昵称
+     * 真实姓名
      */
     private String nickName;
 

base-common/src/main/java/com/ozs/common/core/domain/entity/SysUsers.java

@@ -33,9 +33,9 @@ public class SysUsers implements Serializable {
     private String userName;
 
     /**
-     * 用户昵称
+     * 真实姓名
      */
-    @Excel(name = "用户名称")
+    @Excel(name = "真实姓名")
     private String nickName;
 
     /**
@@ -64,4 +64,8 @@ public class SysUsers implements Serializable {
     /** 部门名称 */
     @Excel(name = "部门名称")
     private String deptName;
+    
+    /** 角色名称 */
+    @Excel(name = "角色名称")
+    private String roleName;
 }

base-common/src/main/java/com/ozs/common/core/domain/vo/SysUserVo.java

@@ -26,7 +26,7 @@ public class SysUserVo extends PageVo implements Serializable {
     private String userName;
 
     /**
-     * 用户昵称
+     * 真实姓名
      */
     private String nickName;
     

base-system/src/main/java/com/ozs/system/mapper/SysRoleMapper.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.ozs.common.core.domain.entity.SysRole;
 import icu.mhb.mybatisplus.plugln.base.mapper.JoinBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 角色表 数据层
@@ -68,6 +69,13 @@ public interface SysRoleMapper extends JoinBaseMapper<SysRole> {
      */
     public SysRole checkRoleNameUnique(String roleName);
 
+    /**
+     * 根据角色名称获取角色ID
+     * @param roleName 角色名称
+     * @return 角色信息
+     */
+     Long getRoleId(@Param("roleName") String roleName);
+
     /**
      * 校验角色权限是否唯一
      *

base-system/src/main/java/com/ozs/system/service/impl/SysUserServiceImpl.java

@@ -539,7 +539,23 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
                     sysUser.setUserId(IdUtils.fastSimpleUUID());
                     SysDept sysDept = deptMapper.selectDeptByDeptName(user.getDeptName());
                     sysUser.setDeptId(sysDept.getDeptId());
+                    sysUser.setPassword(SecurityUtils.encryptPassword("yn5aq5Mt.106.tky"));
                     this.insertUser(sysUser);
+                    SysUser sysUser1 = userMapper.selectUserByUserName(user.getUserName());
+                    String roleName = sysUser.getRoleName();
+                    String[] split = roleName.split(",");
+                    if (StringUtils.isNotEmpty(split)) {
+                        List<Long> id = new ArrayList<>();
+                        for (int i = 0; i < split.length; i++) {
+                            Long roleId = roleMapper.getRoleId(split[i]);
+                            List<SysUserRole> list = new ArrayList<SysUserRole>(id.size());
+                            SysUserRole ur = new SysUserRole();
+                            ur.setUserId(sysUser1.getId());
+                            ur.setRoleId(roleId);
+                            list.add(ur);
+                            userRoleMapper.batchUserRole(list);
+                        }
+                    }
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
                 } else if (isUpdateSupport) {

base-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -69,8 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select r.role_id
         from sys_role r
 	        left join sys_user_role ur on ur.role_id = r.role_id
-	        left join sys_user u on u.user_id = ur.user_id
-	    where u.user_id = #{userId}
+	        left join sys_user u on u.id = ur.user_id
+	    where u.id = #{userId}
 	</select>
 
 	<select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">
@@ -92,8 +92,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectRoleVo"/>
 		 where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
 	</select>
+	<select id="getRoleId" resultType="java.lang.Long">
+		select role_id from sys_role where role_name = #{roleName}
+	</select>
 
- 	<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
+	<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
  		insert into sys_role(
  			<if test="roleId != null and roleId != 0">role_id,</if>
  			<if test="roleName != null and roleName != ''">role_name,</if>