From 40e832044a757b663a4d1ed80ba69cfc5c76fef9 Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Fri, 28 Jul 2023 17:25:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=B7=BB=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5HR=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/controller/SysUserController.java    | 12 ++++++------
 .../com/qs/serve/modules/sys/entity/SysUser.java     |  1 +
 .../qs/serve/modules/sys/entity/bo/SysUserBo.java    |  1 +
 src/main/resources/mapper/sys/SysUserMapper.xml      |  2 ++
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java
index 9cf0bf6a..840197e4 100644
--- a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java
+++ b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java
@@ -355,12 +355,12 @@ public class SysUserController {
 //        if(param.getLoginEnable()!=null){
 //            param.setServingState(param.getLoginEnable()==1?1:0);
 //        }
-        if(param.getSyUserId()==null){
-            param.setSyUserId(null);
-        }
-        if(param.getSyAccount()==null){
-            param.setSyAccount(null);
-        }
+//        if(param.getSyUserId()==null){
+//            param.setSyUserId("");
+//        }
+//        if(param.getSyAccount()==null){
+//            param.setSyAccount("");
+//        }
         param.setSuperFlag(null);
         param.setPassword(null);
         param.setUpdateTime(LocalDateTime.now());
diff --git a/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java b/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java
index 7707c2b3..92f4a1d4 100644
--- a/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java
+++ b/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java
@@ -107,6 +107,7 @@ public class SysUser implements Serializable {
     /** 致远用户id */
     private String syUserId;
 
+    private String hrSystemInfo;
 
     /** 创建时间 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/src/main/java/com/qs/serve/modules/sys/entity/bo/SysUserBo.java b/src/main/java/com/qs/serve/modules/sys/entity/bo/SysUserBo.java
index d2f99627..eb87122c 100644
--- a/src/main/java/com/qs/serve/modules/sys/entity/bo/SysUserBo.java
+++ b/src/main/java/com/qs/serve/modules/sys/entity/bo/SysUserBo.java
@@ -73,4 +73,5 @@ public class SysUserBo {
     /** app推送token */
     //private String appToken;
 
+    private String hrSystemInfo;
 }
diff --git a/src/main/resources/mapper/sys/SysUserMapper.xml b/src/main/resources/mapper/sys/SysUserMapper.xml
index f06e6ce8..ef134ea9 100644
--- a/src/main/resources/mapper/sys/SysUserMapper.xml
+++ b/src/main/resources/mapper/sys/SysUserMapper.xml
@@ -27,6 +27,7 @@
         <result property="tenantId"  column="tenant_id"/>
         <result property="syAccount"  column="sy_account"/>
         <result property="syUserId"  column="sy_user_id"/>
+        <result property="hrSystemInfo"  column="hr_system_info"/>
     </resultMap>
 
     <sql id="sysUserSql">
@@ -87,6 +88,7 @@
             <if test="query.updateBy != null and query.updateBy != ''"> and sys_user.update_by = #{query.updateBy}</if>
             <if test="query.delFlag != null"> and sys_user.del_flag = #{query.delFlag}</if>
             <if test="query.tenantId != null and query.tenantId != ''"> and sys_user.tenant_id = #{query.tenantId}</if>
+            <if test="query.hrSystemInfo != null and query.hrSystemInfo != ''"> and sys_user.hr_system_info = #{hrSystemInfo}</if>
             <if test="query.multiDeptIds != null and query.multiDeptIds.size > 0 "> and sys_user.dept_id in
                 <foreach collection="query.multiDeptIds" item ="muDeptId" index="i" open="(" close=")" separator=",">
                     #{muDeptId}