Merge remote-tracking branch 'origin/main'

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

@@ -172,10 +172,13 @@ public class SysUserController extends BaseController
                 nuser.setUserName(account);
                 nuser.setNickName(account);
                 nuser.setPcId(user.getPcId());
-                nuser.setCreateBy(getUsername());
-                nuser.setRoleIds(roleIds);
+                nuser.setPcIds(String.join(",",user.getPcIds()));
+                nuser.setPcNames(String.join(",",user.getPcNames()));
+                nuser.setVoteIds(String.join(",",user.getVoteIds()));
                 nuser.setItemIds(String.join(",",user.getItemIds()));
                 nuser.setItemNames(String.join(",",user.getItemNames()));
+                nuser.setCreateBy(getUsername());
+                nuser.setRoleIds(roleIds);
                 nuser.setDeptId(user.getDeptId());
                 userService.insertUser(nuser);
                 userList.add(nuser);

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

@@ -3,6 +3,7 @@ package com.ruoyi.common.core.domain.entity;
 import java.util.Date;
 import java.util.List;
 import javax.validation.constraints.*;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -17,99 +18,186 @@ import com.ruoyi.common.xss.Xss;
  *
  * @author ruoyi
  */
-public class SysUser extends BaseEntity
-{
+public class SysUser extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 用户ID */
+    /**
+     * 用户ID
+     */
     @Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号")
     private Long userId;
 
-    /** 部门ID */
+    /**
+     * 部门ID
+     */
     @Excel(name = "部门编号", type = Type.IMPORT)
     private Long deptId;
 
-    /** 用户账号 */
+    /**
+     * 用户账号
+     */
     @Excel(name = "登录名称")
     private String userName;
 
-    /** 用户昵称 */
+    /**
+     * 用户昵称
+     */
     @Excel(name = "用户名称")
     private String nickName;
 
-    /** 用户邮箱 */
+    /**
+     * 用户邮箱
+     */
     @Excel(name = "用户邮箱")
     private String email;
 
-    /** 手机号码 */
+    /**
+     * 手机号码
+     */
     @Excel(name = "手机号码", cellType = ColumnType.TEXT)
     private String phonenumber;
 
-    /** 用户性别 */
+    /**
+     * 用户性别
+     */
     @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
     private String sex;
 
-    /** 用户头像 */
+    /**
+     * 用户头像
+     */
     private String avatar;
 
-    /** 密码 */
+    /**
+     * 密码
+     */
     private String password;
 
-    /** 考核评测id */
+    /**
+     * 考核评测id
+     */
     //@Excel(name = "考核评测id")
     private Long pcId;
 
-    /** 考核项ids */
+    /**
+     * 考核任务ids
+     */
+    // @Excel(name = "考核任务ids")
+    private String pcIds;
+
+    /**
+     * 考核任务名称
+     */
+    //@Excel(name = "考核任务名称")
+    private String pcNames;
+
+    /**
+     * 评分任务ids
+     */
+    //@Excel(name = "评分任务ids")
+    private String voteIds;
+
+    /**
+     * 考核项ids
+     */
     //@Excel(name = "考核项ids")
     private String itemIds;
-    /** 考核项名称s */
+    /**
+     * 考核项名称s
+     */
     private String itemNames;
 
-    /** 手机uid */
+    /**
+     * 手机uid
+     */
     //@Excel(name = "手机uid")
     private String uid;
 
-    /** 账号状态（0正常 1停用） */
+    /**
+     * 账号状态（0正常 1停用）
+     */
     @Excel(name = "账号状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
-    /** 删除标志（0代表存在 2代表删除） */
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
     private String delFlag;
 
-    /** 最后登录IP */
+    /**
+     * 最后登录IP
+     */
     @Excel(name = "最后登录IP", type = Type.EXPORT)
     private String loginIp;
 
-    /** 最后登录时间 */
+    /**
+     * 最后登录时间
+     */
     @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     private Date loginDate;
 
-    /** 密码最后更新时间 */
+    /**
+     * 密码最后更新时间
+     */
     private Date pwdUpdateDate;
 
-    /** 部门对象 */
+    /**
+     * 部门对象
+     */
     @Excels({
-        @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
-        @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
+            @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
+            @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
     })
     private SysDept dept;
 
-    /** 角色对象 */
+    /**
+     * 角色对象
+     */
     private List<SysRole> roles;
 
-    /** 角色组 */
+    /**
+     * 角色组
+     */
     private Long[] roleIds;
 
-    /** 岗位组 */
+    /**
+     * 岗位组
+     */
     private Long[] postIds;
 
-    /** 角色ID */
+    /**
+     * 角色ID
+     */
     private Long roleId;
     /**
      * 仅做参数使用，批量生成用户的数量
      */
     private Integer num;
 
+    public String getPcIds() {
+        return pcIds;
+    }
+
+    public void setPcIds(String pcIds) {
+        this.pcIds = pcIds;
+    }
+
+    public String getPcNames() {
+        return pcNames;
+    }
+
+    public void setPcNames(String pcNames) {
+        this.pcNames = pcNames;
+    }
+
+    public String getVoteIds() {
+        return voteIds;
+    }
+
+    public void setVoteIds(String voteIds) {
+        this.voteIds = voteIds;
+    }
+
     public String getItemNames() {
         return itemNames;
     }
@@ -142,8 +230,7 @@ public class SysUser extends BaseEntity
         this.itemIds = itemIds;
     }
 
-    public SysUser()
-    {
+    public SysUser() {
 
     }
 
@@ -155,242 +242,207 @@ public class SysUser extends BaseEntity
         this.pcId = pcId;
     }
 
-    public SysUser(Long userId)
-    {
+    public SysUser(Long userId) {
         this.userId = userId;
     }
 
-    public Long getUserId()
-    {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(Long userId)
-    {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 
-    public boolean isAdmin()
-    {
+    public boolean isAdmin() {
         return isAdmin(this.userId);
     }
 
-    public static boolean isAdmin(Long userId)
-    {
+    public static boolean isAdmin(Long userId) {
         return userId != null && 1L == userId;
     }
 
-    public Long getDeptId()
-    {
+    public Long getDeptId() {
         return deptId;
     }
 
-    public void setDeptId(Long deptId)
-    {
+    public void setDeptId(Long deptId) {
         this.deptId = deptId;
     }
 
     @Xss(message = "用户昵称不能包含脚本字符")
     @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
-    public String getNickName()
-    {
+    public String getNickName() {
         return nickName;
     }
 
-    public void setNickName(String nickName)
-    {
+    public void setNickName(String nickName) {
         this.nickName = nickName;
     }
 
     @Xss(message = "用户账号不能包含脚本字符")
     @NotBlank(message = "用户账号不能为空")
     @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
-    public String getUserName()
-    {
+    public String getUserName() {
         return userName;
     }
 
-    public void setUserName(String userName)
-    {
+    public void setUserName(String userName) {
         this.userName = userName;
     }
 
     @Email(message = "邮箱格式不正确")
     @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public String getEmail()
-    {
+    public String getEmail() {
         return email;
     }
 
-    public void setEmail(String email)
-    {
+    public void setEmail(String email) {
         this.email = email;
     }
 
     @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
-    public String getPhonenumber()
-    {
+    public String getPhonenumber() {
         return phonenumber;
     }
 
-    public void setPhonenumber(String phonenumber)
-    {
+    public void setPhonenumber(String phonenumber) {
         this.phonenumber = phonenumber;
     }
 
-    public String getSex()
-    {
+    public String getSex() {
         return sex;
     }
 
-    public void setSex(String sex)
-    {
+    public void setSex(String sex) {
         this.sex = sex;
     }
 
-    public String getAvatar()
-    {
+    public String getAvatar() {
         return avatar;
     }
 
-    public void setAvatar(String avatar)
-    {
+    public void setAvatar(String avatar) {
         this.avatar = avatar;
     }
 
-    public String getPassword()
-    {
+    public String getPassword() {
         return password;
     }
 
-    public void setPassword(String password)
-    {
+    public void setPassword(String password) {
         this.password = password;
     }
 
-    public String getStatus()
-    {
+    public String getStatus() {
         return status;
     }
 
-    public void setStatus(String status)
-    {
+    public void setStatus(String status) {
         this.status = status;
     }
 
-    public String getDelFlag()
-    {
+    public String getDelFlag() {
         return delFlag;
     }
 
-    public void setDelFlag(String delFlag)
-    {
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
 
-    public String getLoginIp()
-    {
+    public String getLoginIp() {
         return loginIp;
     }
 
-    public void setLoginIp(String loginIp)
-    {
+    public void setLoginIp(String loginIp) {
         this.loginIp = loginIp;
     }
 
-    public Date getLoginDate()
-    {
+    public Date getLoginDate() {
         return loginDate;
     }
 
-    public void setLoginDate(Date loginDate)
-    {
+    public void setLoginDate(Date loginDate) {
         this.loginDate = loginDate;
     }
 
-    public Date getPwdUpdateDate()
-    {
+    public Date getPwdUpdateDate() {
         return pwdUpdateDate;
     }
 
-    public void setPwdUpdateDate(Date pwdUpdateDate)
-    {
+    public void setPwdUpdateDate(Date pwdUpdateDate) {
         this.pwdUpdateDate = pwdUpdateDate;
     }
 
-    public SysDept getDept()
-    {
+    public SysDept getDept() {
         return dept;
     }
 
-    public void setDept(SysDept dept)
-    {
+    public void setDept(SysDept dept) {
         this.dept = dept;
     }
 
-    public List<SysRole> getRoles()
-    {
+    public List<SysRole> getRoles() {
         return roles;
     }
 
-    public void setRoles(List<SysRole> roles)
-    {
+    public void setRoles(List<SysRole> roles) {
         this.roles = roles;
     }
 
-    public Long[] getRoleIds()
-    {
+    public Long[] getRoleIds() {
         return roleIds;
     }
 
-    public void setRoleIds(Long[] roleIds)
-    {
+    public void setRoleIds(Long[] roleIds) {
         this.roleIds = roleIds;
     }
 
-    public Long[] getPostIds()
-    {
+    public Long[] getPostIds() {
         return postIds;
     }
 
-    public void setPostIds(Long[] postIds)
-    {
+    public void setPostIds(Long[] postIds) {
         this.postIds = postIds;
     }
 
-    public Long getRoleId()
-    {
+    public Long getRoleId() {
         return roleId;
     }
 
-    public void setRoleId(Long roleId)
-    {
+    public void setRoleId(Long roleId) {
         this.roleId = roleId;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("userId", getUserId())
-            .append("deptId", getDeptId())
-            .append("userName", getUserName())
-            .append("nickName", getNickName())
-            .append("email", getEmail())
-            .append("phonenumber", getPhonenumber())
-            .append("sex", getSex())
-            .append("avatar", getAvatar())
-            .append("password", getPassword())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("loginIp", getLoginIp())
-            .append("loginDate", getLoginDate())
-            .append("pwdUpdateDate", getPwdUpdateDate())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .append("dept", getDept())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("userId", getUserId())
+                .append("deptId", getDeptId())
+                .append("userName", getUserName())
+                .append("nickName", getNickName())
+                .append("email", getEmail())
+                .append("phonenumber", getPhonenumber())
+                .append("sex", getSex())
+                .append("avatar", getAvatar())
+                .append("password", getPassword())
+                .append("pcId", getPcId())
+                .append("pcIds", getPcIds())
+                .append("pcNames", getPcNames())
+                .append("voteIds", getVoteIds())
+                .append("itemIds", getItemIds())
+                .append("itemNames", getItemNames())
+                .append("status", getStatus())
+                .append("delFlag", getDelFlag())
+                .append("loginIp", getLoginIp())
+                .append("loginDate", getLoginDate())
+                .append("pwdUpdateDate", getPwdUpdateDate())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .append("dept", getDept())
+                .toString();
     }
 }

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteController.java

@@ -112,7 +112,7 @@ public class KhVoteController extends BaseController {
     }
 
     /**
-     * 首页根据pingceId、itemIds、state查询投票评测列表
+     * 职工首页根据pingceId、itemIds、state查询投票评测列表————废弃
      */
     @PreAuthorize("@ss.hasPermi('kaohe:vote:list')")
     @GetMapping("/listByConditons")
@@ -122,6 +122,18 @@ public class KhVoteController extends BaseController {
         List<KhVote> list = khVoteService.getListByPcIdAndItemIds(khVote);
         return getDataTable(list);
     }
+    /**
+     * 评价账号登录首页根据pingceId、itemIds、state查询投票评测列表
+     * 参数: voteIds
+     */
+    @PreAuthorize("@ss.hasPermi('kaohe:vote:list')")
+    @GetMapping("/ListByVoteIds")
+    public TableDataInfo getListByVoteIds(KhVote khVote) {
+        khVote.setState("2");
+        startPage();
+        List<KhVote> list = khVoteService.getListByVoteIds(khVote);
+        return getDataTable(list);
+    }
 
     /**
      * 导出投票评测列表

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

@@ -31,6 +31,10 @@ public class KhVote extends BaseEntity
     @Excel(name = "所属评测名称")
     private String pingceName;
 
+    /** 被考核对象类型 */
+    //@Excel(name = "被考核对象类型")
+    private String bkhdxType;
+
     /** 考核项id */
     @Excel(name = "考核项id")
     private Long khitemId;
@@ -96,10 +100,29 @@ public class KhVote extends BaseEntity
      */
     private  List<KhVoteEmp> voteEmps;
 
+    //首页查询评分任务的参数
+    private List<Long> voteIds;
+
+    public List<Long> getVoteIds() {
+        return voteIds;
+    }
+
+    public void setVoteIds(List<Long> voteIds) {
+        this.voteIds = voteIds;
+    }
+
     public Integer getUmax() {
         return umax;
     }
 
+    public String getBkhdxType() {
+        return bkhdxType;
+    }
+
+    public void setBkhdxType(String bkhdxType) {
+        this.bkhdxType = bkhdxType;
+    }
+
     public void setUmax(Integer umax) {
         this.umax = umax;
     }
@@ -272,6 +295,7 @@ public class KhVote extends BaseEntity
                 .append("id", getId())
                 .append("pingceId", getPingceId())
                 .append("pingceName", getPingceName())
+                .append("bkxdxType", getBkhdxType())
                 .append("khitemId", getKhitemId())
                 .append("khitemName", getKhitemName())
                 .append("khitemTypeid", getKhitemTypeid())

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/mapper/KhVoteMapper.java

@@ -62,4 +62,6 @@ public interface KhVoteMapper
     List<KhVote> getListByPcIdAndItemIds(KhVote khVote);
 
     List<KhVote> selectUnfinishedVote();
+
+    List<KhVote> getListByVoteIds(KhVote khVote);
 }

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/IKhVoteService.java

@@ -62,4 +62,6 @@ public interface IKhVoteService
     List<KhVote> getListByPcIdAndItemIds(KhVote khVote);
 
     List<KhVote> selectUnfinishedVote();
+
+    List<KhVote> getListByVoteIds(KhVote khVote);
 }

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

@@ -114,6 +114,9 @@ public class KhVoteServiceImpl implements IKhVoteService
     public List<KhVote> getListByPcIdAndItemIds(KhVote khVote) {
         return khVoteMapper.getListByPcIdAndItemIds(khVote);
     }
+    public List<KhVote> getListByVoteIds(KhVote khVote) {
+        return khVoteMapper.getListByVoteIds(khVote);
+    }
 
     @Override
     public List<KhVote> selectUnfinishedVote() {

ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml

@@ -8,6 +8,7 @@
         <result property="id"    column="id"    />
         <result property="pingceId"    column="pingce_id"    />
         <result property="pingceName"    column="pingce_name"    />
+        <result property="bkhdxType"    column="bkhdx_type"    />
         <result property="khitemId"    column="khitem_id"    />
         <result property="khitemName"    column="khitem_name"    />
         <result property="khitemTypeid"    column="khitem_typeId"    />
@@ -29,14 +30,16 @@
     </resultMap>
 
     <sql id="selectKhVoteVo">
-        select id, pingce_id, pingce_name, khitem_id, khitem_name, khitem_typeId, vote_items, vote_title, v_description, s_time, e_time, max_num, umax, percentage, `state`,same_percent, create_by, create_time, update_by, update_time, remark from kh_vote
+        select id, pingce_id, pingce_name,bkhdx_type, khitem_id, khitem_name, khitem_typeId, vote_items, vote_title, v_description, s_time, e_time, max_num, umax, percentage, `state`,same_percent, create_by, create_time, update_by, update_time, remark from kh_vote
     </sql>
 
     <select id="selectKhVoteList" parameterType="KhVote" resultMap="KhVoteResult">
         select v.*,it.type_id from kh_vote v left join kh_items it on   v.khitem_id =it.id
-        <where>
-            <if test="pingceId != null "> and pingce_id = #{pingceId}</if>
-            <if test="pingceName != null  and pingceName != ''"> and pingce_name like concat('%', #{pingceName}, '%')</if>
+        <!--left join kh_pingce p on v.pingce_id=p.id-->
+       <where>
+           <if test="pingceId != null "> and pingce_id = #{pingceId}</if>
+           <if test="pingceName != null  and pingceName != ''"> and pingce_name like concat('%', #{pingceName}, '%')</if>
+         <!--  <if test="pingceName != null  and pingceName != ''"> and p.bkhdx_type = #{bkhdxType}=</if>-->
             <if test="khitemId != null "> and khitem_id = #{khitemId}</if>
             <if test="khitemName != null  and khitemName != ''"> and khitem_name like concat('%', #{khitemName}, '%')</if>
             <if test="khitemTypeid != null "> and khitem_typeId = #{khitemTypeid}</if>
@@ -52,7 +55,7 @@
             <if test="samePercent != null  and samePercent != ''"> and same_percent = #{samePercent}</if>
         </where>
     </select>
-
+    <!--生成评测账号登录时筛选符合条件的vote展示评分     ————废弃————   -->
     <select id="getListByPcIdAndItemIds" parameterType="KhVote" resultMap="KhVoteResult">
         select v.*,it.type_id from kh_vote v left join kh_items it on   v.khitem_id =it.id
         <where>
@@ -66,6 +69,20 @@
             </if>
         </where>
     </select>
+    <!-- 评测账号登录时筛选符合条件的vote展示评分 -->
+    <select id="getListByVoteIds" parameterType="KhVote" resultMap="KhVoteResult">
+        select v.*,it.type_id from kh_vote v left join kh_items it on   v.khitem_id =it.id
+        <where>
+            <if test="pingceId != null "> and pingce_id = #{pingceId}</if>
+            <!--状态值传1，也就是展示所有状态不等于2（非完成状态）的数据-->
+            <if test="state != null  and state != ''"> and state != #{state}</if>
+            <if test="voteIds != null"> and v.id in
+                <foreach item="voteId" collection="voteIds" open="(" separator="," close=")">
+                    #{voteId}
+                </foreach>
+            </if>
+        </where>
+    </select>
 
     <select id="selectUnfinishedVote" parameterType="KhVote" resultMap="KhVoteResult">
         select v.*,it.type_id from kh_vote v left join kh_items it on   v.khitem_id =it.id
@@ -73,7 +90,8 @@
     </select>
 
     <select id="selectKhVoteById" parameterType="Long" resultMap="KhVoteResult">
-        select v.*,it.type_id from kh_vote v left join kh_items it on   v.khitem_id =it.id
+        select v.*,it.type_id,p.bkhdx_type from kh_vote v left join kh_items it on   v.khitem_id =it.id
+        left join kh_pingce p on v.pingce_id=p.id
         where v.id = #{id}
     </select>
 

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

@@ -15,7 +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="pcIds"    column="pc_ids"    />
+		<result property="pcNames"    column="pc_names"    />
+		<result property="voteIds"    column="vote_ids"    />
 		<result property="itemIds"    column="item_ids"    />
 		<result property="itemNames"    column="item_names"    />
 		<result property="uid"    column="uid"    />
@@ -53,7 +55,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.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,
+        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.pc_ids,u.pc_names,u.vote_ids, 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
@@ -63,7 +65,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.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
+		select u.user_id, u.dept_id, u.nick_name, u.user_name,u.pc_id,u.pc_ids,u.pc_names,u.vote_ids, 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">
@@ -93,7 +95,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.item_names,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.pc_ids,u.pc_names,u.vote_ids,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
@@ -110,7 +112,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.item_names,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.pc_ids,u.pc_names,u.vote_ids, 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
@@ -161,6 +163,9 @@ 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="pcIds != null">pc_ids,</if>
+		<if test="pcNames != null">pc_names,</if>
+		<if test="voteIds != null">vote_ids,</if>
 		    <if test="itemIds != null">item_ids,</if>
 		    <if test="itemNames != null">item_names,</if>
 		    <if test="uid != null">uid,</if>
@@ -180,6 +185,9 @@ 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="pcIds != null">#{pcIds},</if>
+		<if test="pcNames != null">#{pcNames},</if>
+		<if test="voteIds != null">#{voteIds},</if>
 		    <if test="itemIds != null">#{itemIds},</if>
 		    <if test="itemNames != null">#{itemNames},</if>
 		    <if test="uid != null">#{uid},</if>
@@ -202,6 +210,9 @@ 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="pcIds != null">pc_ids = #{pcIds},</if>
+			<if test="pcNames != null">pc_names = #{pcNames},</if>
+			<if test="voteIds != null">vote_ids = #{voteIds},</if>
 			<if test="itemIds != null">item_ids = #{itemIds},</if>
 			<if test="itemNames != null">item_names = #{itemNames},</if>
 			<if test="uid != null">uid = #{uid},</if>