hansha
/
kaohe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

用户添加itemIds字段

Browse Source
main
hshansha 6 months ago
parent ef6ad55623
commit cd3cd35b29
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
Unescape View File

@ -147,7 +147,8 @@ public class SysUserController extends BaseController
@Log(title = "用户管理", businessType = BusinessType.INSERT)
@PostMapping("/adds")
@Transactional
public AjaxResult adds(@RequestParam("num")int num ,@RequestParam("pcId" )Long pcId)
public AjaxResult adds(@RequestParam("num")int num ,@RequestParam("pcId" )Long pcId,
@RequestParam("itemIds" )String[] itemIds)
{
List<SysUser> userList = new ArrayList();
if(num>0){
@ -161,6 +162,7 @@ public class SysUserController extends BaseController
user.setPcId(pcId);
user.setCreateBy(getUsername());
user.setRoleIds(roleIds);
user.setItemIds(String.join(",",itemIds));
userService.insertUser(user);
user.setPassword("111111");
userList.add(user);

14
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
Unescape View File

@ -56,9 +56,13 @@ public class SysUser extends BaseEntity
private String password;
/** 考核评测id */
@Excel(name = "考核评测id")
//@Excel(name = "考核评测id")
private Long pcId;
/** 考核项ids */
//@Excel(name = "考核项ids")
private String itemIds;
/** 账号状态（0正常 1停用） */
@Excel(name = "账号状态", readConverterExp = "0=正常,1=停用")
private String status;
@ -96,6 +100,14 @@ public class SysUser extends BaseEntity
/** 角色ID */
private Long roleId;
public String getItemIds() {
return itemIds;
}
public void setItemIds(String itemIds) {
this.itemIds = itemIds;
}
public SysUser()
{

11
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
Unescape View File

@ -49,7 +49,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.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.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
@ -59,7 +59,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.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.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">
@ -89,7 +89,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.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.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
@ -106,7 +106,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.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.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
@ -157,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sex != null and sex != ''">sex,</if>
<if test="password != null and password != ''">password,</if>
<if test="pcId != null">pc_id,</if>
<if test="itemIds != null">item_ids,</if>
<if test="status != null and status != ''">status,</if>
<if test="pwdUpdateDate != null">pwd_update_date,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
@ -173,6 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sex != null and sex != ''">#{sex},</if>
<if test="password != null and password != ''">#{password},</if>
<if test="pcId != null">#{pcId},</if>
<if test="itemIds != null">#{itemIds},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="pwdUpdateDate != null">#{pwdUpdateDate},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
@ -192,6 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
<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="status != null and status != ''">status = #{status},</if>
<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
<if test="loginDate != null">login_date = #{loginDate},</if>

Write Preview
Loading…
Cancel
Save