Merge remote-tracking branch 'origin/v1.0' into v1.0

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());

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")

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;
 }

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}