diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index a3291a9..d07d78a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -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 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); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index 700bf2b..d346d85 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -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() { diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 1b7b086..2cf3688 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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"