Merge remote-tracking branch 'origin/main'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -1,7 +1,9 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
@@ -152,20 +154,24 @@ public class SysUserController extends BaseController
         List<SysUser> userList = new ArrayList();
         Integer num = user.getNum();
         if(num!=null&&num>0){
-            Long[] roleIds = {100L};
+            Long[] roleIds = {100L};  //固定的评分账号角色id
-            for(int i=1;i<=num;i++){
+            HashSet<String> accounts = new HashSet<>();
+            while (accounts.size() < num) {
+                String randomUserName = RandomStringUtils.randomAlphanumeric(8);
+                accounts.add(randomUserName);
+            }
+            for(String account : accounts) {
                 SysUser nuser = new SysUser();
                 nuser.setPassword(SecurityUtils.encryptPassword("111111"));
-                String randomUserName = RandomStringUtils.randomAlphanumeric(8);
+                nuser.setUserName(account);
-                nuser.setUserName(randomUserName);
+                nuser.setNickName(account);
-                nuser.setNickName(randomUserName);
                 nuser.setPcId(user.getPcId());
                 nuser.setCreateBy(getUsername());
                 nuser.setRoleIds(roleIds);
                 nuser.setItemIds(String.join(",",user.getItemIds()));
+                nuser.setItemNames(String.join(",",user.getItemNames()));
                 nuser.setDeptId(user.getDeptId());
                 userService.insertUser(nuser);
-                nuser.setPassword("111111");
                 userList.add(nuser);
             }
         }else{

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

@@ -62,6 +62,8 @@ public class SysUser extends BaseEntity
     /** 考核项ids */
     //@Excel(name = "考核项ids")
     private String itemIds;
+    /** 考核项名称s */
+    private String itemNames;
 
     /** 手机uid */
     //@Excel(name = "手机uid")
@@ -108,6 +110,14 @@ public class SysUser extends BaseEntity
      */
     private Integer num;
 
+    public String getItemNames() {
+        return itemNames;
+    }
+
+    public void setItemNames(String itemNames) {
+        this.itemNames = itemNames;
+    }
+
     public String getUid() {
         return uid;
     }

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhEmployee.java

@@ -35,7 +35,7 @@ public class KhEmployee extends BaseEntity
     private String empName;
 
     /** 性别（0：男 1：女) */
-    @Excel(name = "性别", readConverterExp = "性别（0：男 1：女)")
+    @Excel(name = "性别(男/女/未知)",readConverterExp = "0=男,1=女,2=未知")
     private String sex;
 
     /** 年龄 */

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhEmployeeServiceImpl.java

@@ -133,7 +133,7 @@ public class KhEmployeeServiceImpl implements IKhEmployeeService
                 }
                 else if (updateSupport)
                 {
-                    employee.setId(param.getId());
+                    employee.setId(e.get(0).getId());
                     khEmployeeMapper.updateKhEmployee(employee);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + employee.getEmpName() + " 更新成功");

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -15,6 +15,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="avatar"        column="avatar"          />
         <result property="password"      column="password"        />
 		<result property="pcId"    column="pc_id"    />
+		<result property="pcId"    column="pc_id"    />
+		<result property="itemIds"    column="item_ids"    />
+		<result property="itemNames"    column="item_names"    />
 		<result property="uid"    column="uid"    />
         <result property="status"        column="status"          />
         <result property="delFlag"       column="del_flag"        />
@@ -50,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 	
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password,u.pc_id, u.item_ids,u.uid, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark,
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password,u.pc_id, u.item_ids, u.item_names,u.uid, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
@@ -60,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name,u.pc_id, u.item_ids,u.uid, u.sex, u.email, u.avatar, u.phonenumber, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.user_id, u.dept_id, u.nick_name, u.user_name,u.pc_id, u.item_ids, u.item_names,u.uid, u.sex, u.email, u.avatar, u.phonenumber, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
@@ -90,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name,u.pc_id,u.item_ids,u.uid, u.email, u.phonenumber, u.status, u.create_time
+	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name,u.pc_id,u.item_ids, u.item_names,u.uid, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_user_role ur on u.user_id = ur.user_id
@@ -107,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.pc_id, u.item_ids,u.uid,u.email, u.phonenumber, u.status, u.create_time
+	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.pc_id, u.item_ids, u.item_names,u.uid,u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_user_role ur on u.user_id = ur.user_id
@@ -159,6 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="password != null and password != ''">password,</if>
 		    <if test="pcId != null">pc_id,</if>
 		    <if test="itemIds != null">item_ids,</if>
+		    <if test="itemNames != null">item_names,</if>
 		    <if test="uid != null">uid,</if>
  			<if test="status != null and status != ''">status,</if>
  			<if test="pwdUpdateDate != null">pwd_update_date,</if>
@@ -177,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="password != null and password != ''">#{password},</if>
 		    <if test="pcId != null">#{pcId},</if>
 		    <if test="itemIds != null">#{itemIds},</if>
+		    <if test="itemNames != null">#{itemNames},</if>
 		    <if test="uid != null">#{uid},</if>
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="pwdUpdateDate != null">#{pwdUpdateDate},</if>
@@ -198,6 +203,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="password != null and password != ''">password = #{password},</if>
 			<if test="pcId != null">pc_id = #{pcId},</if>
 			<if test="itemIds != null">item_ids = #{itemIds},</if>
+			<if test="itemNames != null">item_names = #{itemNames},</if>
 			<if test="uid != null">uid = #{uid},</if>
  			<if test="status != null and status != ''">status = #{status},</if>
  			<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>