新增员工信息字段---同时修改同步任务员工信息存储

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java

@@ -104,7 +104,8 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
                         }
                         staffEntity1.setName(list.getPersonName());
                         staffEntity1.setRemarkId(list.getPersonId());
-                        staffEntity1.setPhotoPath(list.getPersonPhoto().getPicUri());
+                        staffEntity1.setPicUri(list.getPersonPhoto().getPicUri());
+                        staffEntity1.setServerIndexCode(list.getPersonPhoto().getServerIndexCode());
                         staffEntity1.setDeptName(list.getOrgName());
                         staffEntity1.setSource(1);
                         staffEntity1.setStatus(1);
@@ -145,7 +146,8 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
                         }
                         staffEntity1.setName(list.getPersonName());
                         staffEntity1.setRemarkId(list.getPersonId());
-                        staffEntity1.setPhotoPath(list.getPersonPhoto().getPicUri());
+                        staffEntity1.setPicUri(list.getPersonPhoto().getPicUri());
+                        staffEntity1.setServerIndexCode(list.getPersonPhoto().getServerIndexCode());
                         staffEntity1.setDeptName(list.getOrgName());
                         staffEntity1.setGender(list.getGender());
                         staffEntity1.setWorkNum(list.getJobNo());

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffEntity.java

@@ -7,7 +7,7 @@ import java.util.Date;
  * 员工基本信息实体对象
  *
  * @author zxfei
- * @date 2023-04-08
+ * @date 2023-04-14
  */
 
 public class StaffEntity extends StaffVo {
@@ -97,6 +97,14 @@ public class StaffEntity extends StaffVo {
      * 员工来源(1.外部,2.内部)
      */
     private Integer source;
+    /**
+     * 相对图片pic
+     */
+    private String picUri;
+    /**
+     * 图片资源唯一标识
+     */
+    private String serverIndexCode;
 
 
 
@@ -395,6 +403,34 @@ public class StaffEntity extends StaffVo {
     public void setSource(Integer source){
         this.source = source;
     }
+    /**
+     * 获取 相对图片pic
+     * @return String
+     */
+    public String getPicUri(){
+        return picUri;
+    }
+    /**
+     * 设置 相对图片pic
+     * @param picUri
+     */
+    public void setPicUri(String picUri){
+        this.picUri = picUri;
+    }
+    /**
+     * 获取 图片资源唯一标识
+     * @return String
+     */
+    public String getServerIndexCode(){
+        return serverIndexCode;
+    }
+    /**
+     * 设置 图片资源唯一标识
+     * @param serverIndexCode
+     */
+    public void setServerIndexCode(String serverIndexCode){
+        this.serverIndexCode = serverIndexCode;
+    }
 
 
 
@@ -438,6 +474,8 @@ public class StaffEntity extends StaffVo {
         sb.append(",remark:").append(getRemark());
         sb.append(",remarkId:").append(getRemarkId());
         sb.append(",source:").append(getSource());
+        sb.append(",picUri:").append(getPicUri());
+        sb.append(",serverIndexCode:").append(getServerIndexCode());
         return sb.toString();
     }
 
@@ -483,6 +521,10 @@ public class StaffEntity extends StaffVo {
 
         this.remarkId = "";
 
-        this.source = 2;
+        this.source = 1;
+
+        this.picUri = "";
+
+        this.serverIndexCode = "";
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffQuery.java

@@ -5,7 +5,7 @@ import java.util.List;
  * 员工基本信息查询对象
  *
  * @author zxfei
- * @date 2023-04-10
+ * @date 2023-04-14
  */
 public class StaffQuery extends StaffEntity {
     /** 开始 序号，主键，自增长 */
@@ -244,6 +244,16 @@ public class StaffQuery extends StaffEntity {
     /** 员工来源(1.外部,2.内部)排除列表 */
     private List <Integer> sourceNotList;
 
+    /** 相对图片pic */
+    private List<String> picUriList;
+
+    /** 相对图片pic排除列表 */
+    private List <String> picUriNotList;
+    /** 图片资源唯一标识 */
+    private List<String> serverIndexCodeList;
+
+    /** 图片资源唯一标识排除列表 */
+    private List <String> serverIndexCodeNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<StaffQuery> orConditionList;
 
@@ -1574,6 +1584,70 @@ public class StaffQuery extends StaffEntity {
     }
 
 
+    /**
+     * 获取 相对图片pic
+     * @return picUriList
+     */
+    public List<String> getPicUriList(){
+        return this.picUriList;
+    }
+
+    /**
+     * 设置 相对图片pic
+     * @param picUriList
+     */
+    public void setPicUriList(List<String> picUriList){
+        this.picUriList = picUriList;
+    }
+
+    /**
+     * 获取 相对图片pic
+     * @return picUriNotList
+     */
+    public List<String> getPicUriNotList(){
+        return this.picUriNotList;
+    }
+
+    /**
+     * 设置 相对图片pic
+     * @param picUriNotList
+     */
+    public void setPicUriNotList(List<String> picUriNotList){
+        this.picUriNotList = picUriNotList;
+    }
+
+    /**
+     * 获取 图片资源唯一标识
+     * @return serverIndexCodeList
+     */
+    public List<String> getServerIndexCodeList(){
+        return this.serverIndexCodeList;
+    }
+
+    /**
+     * 设置 图片资源唯一标识
+     * @param serverIndexCodeList
+     */
+    public void setServerIndexCodeList(List<String> serverIndexCodeList){
+        this.serverIndexCodeList = serverIndexCodeList;
+    }
+
+    /**
+     * 获取 图片资源唯一标识
+     * @return serverIndexCodeNotList
+     */
+    public List<String> getServerIndexCodeNotList(){
+        return this.serverIndexCodeNotList;
+    }
+
+    /**
+     * 设置 图片资源唯一标识
+     * @param serverIndexCodeNotList
+     */
+    public void setServerIndexCodeNotList(List<String> serverIndexCodeNotList){
+        this.serverIndexCodeNotList = serverIndexCodeNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -2310,6 +2384,44 @@ public class StaffQuery extends StaffEntity {
         return this;
     }
 
+
+    /**
+     * 设置 相对图片pic
+     * @param picUri
+     */
+    public StaffQuery picUri(String picUri){
+        setPicUri(picUri);
+        return this;
+    }
+
+    /**
+     * 设置 相对图片pic
+     * @param picUriList
+     */
+    public StaffQuery picUriList(List<String> picUriList){
+        this.picUriList = picUriList;
+        return this;
+    }
+
+
+    /**
+     * 设置 图片资源唯一标识
+     * @param serverIndexCode
+     */
+    public StaffQuery serverIndexCode(String serverIndexCode){
+        setServerIndexCode(serverIndexCode);
+        return this;
+    }
+
+    /**
+     * 设置 图片资源唯一标识
+     * @param serverIndexCodeList
+     */
+    public StaffQuery serverIndexCodeList(List<String> serverIndexCodeList){
+        this.serverIndexCodeList = serverIndexCodeList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

attendance-performance-manager/src/main/resources/sqlmap/module/staff/StaffMapper.xml

@@ -31,6 +31,8 @@
         <result property="updateTime" column="updateTime" />
         <result property="remarkId" column="remarkId" />
         <result property="source" column="source" />
+        <result property="picUri" column="picUri" />
+        <result property="serverIndexCode" column="serverIndexCode" />
 
     </resultMap>
 
@@ -116,23 +118,29 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
                 a.source,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('picUri') or colPickMode == 1 and data.containsKey('picUri')))">
+                a.picUri,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serverIndexCode') or colPickMode == 1 and data.containsKey('serverIndexCode')))">
+                a.serverIndexCode,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="StaffEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_staff
-        (name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,source)
+        (name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,source,picUri,serverIndexCode)
         VALUES
-        (#{name},#{gender},#{birthday},#{photoPath},#{phoneNumber},#{idCard},#{workNum},#{politicalstatus},#{deptId},#{deptName},#{positionId},#{positionName},#{staffType},#{status},#{registerPath},#{entryDate},#{regularDate},#{leaveDate},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{remarkId},#{source})
+        (#{name},#{gender},#{birthday},#{photoPath},#{phoneNumber},#{idCard},#{workNum},#{politicalstatus},#{deptId},#{deptName},#{positionId},#{positionName},#{staffType},#{status},#{registerPath},#{entryDate},#{regularDate},#{leaveDate},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{remarkId},#{source},#{picUri},#{serverIndexCode})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_staff
-        (name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,source)
+        (name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,source,picUri,serverIndexCode)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.name},#{item.gender},#{item.birthday},#{item.photoPath},#{item.phoneNumber},#{item.idCard},#{item.workNum},#{item.politicalstatus},#{item.deptId},#{item.deptName},#{item.positionId},#{item.positionName},#{item.staffType},#{item.status},#{item.registerPath},#{item.entryDate},#{item.regularDate},#{item.leaveDate},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.remarkId},#{item.source})
+            (#{item.name},#{item.gender},#{item.birthday},#{item.photoPath},#{item.phoneNumber},#{item.idCard},#{item.workNum},#{item.politicalstatus},#{item.deptId},#{item.deptName},#{item.positionId},#{item.positionName},#{item.staffType},#{item.status},#{item.registerPath},#{item.entryDate},#{item.regularDate},#{item.leaveDate},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.remarkId},#{item.source},#{item.picUri},#{item.serverIndexCode})
         </foreach>
     </insert>
 
@@ -244,6 +252,12 @@
             <if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))">
                 a.source=ifnull(a.source,0) + #{data.sourceIncrement},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('picUri')) or (colPickMode==1 and !data.containsKey('picUri'))">
+                a.picUri=#{data.picUri},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('serverIndexCode')) or (colPickMode==1 and !data.containsKey('serverIndexCode'))">
+                a.serverIndexCode=#{data.serverIndexCode},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -476,6 +490,20 @@
                     </choose>
                 </foreach>
             </trim>
+            <trim prefix="picUri=(case" suffix="ELSE picUri end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('picUri')) or (colPickMode==1 and !item.containsKey('picUri'))">
+                        when a.id=#{item.id} then #{item.picUri}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="serverIndexCode=(case" suffix="ELSE serverIndexCode end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('serverIndexCode')) or (colPickMode==1 and !item.containsKey('serverIndexCode'))">
+                        when a.id=#{item.id} then #{item.serverIndexCode}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -600,13 +628,13 @@
                 ${_conditionType_} a.id is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('idList')">
+        <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
             ${_conditionType_} a.id in
             <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('idNotList')">
+        <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
             ${_conditionType_} a.id not in
             <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -628,13 +656,13 @@
                 ${_conditionType_} a.name is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('nameList')">
+        <if test="conditionParamRef.containsKey('nameList') and conditionParamRef.nameList.size() > 0">
             ${_conditionType_} a.name in
             <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('nameNotList')">
+        <if test="conditionParamRef.containsKey('nameNotList') and conditionParamRef.nameNotList.size() > 0">
             ${_conditionType_} a.name not in
             <foreach collection="conditionParamRef.nameNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -648,13 +676,13 @@
                 ${_conditionType_} a.gender is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('genderList')">
+        <if test="conditionParamRef.containsKey('genderList') and conditionParamRef.genderList.size() > 0">
             ${_conditionType_} a.gender in
             <foreach collection="conditionParamRef.genderList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('genderNotList')">
+        <if test="conditionParamRef.containsKey('genderNotList') and conditionParamRef.genderNotList.size() > 0">
             ${_conditionType_} a.gender not in
             <foreach collection="conditionParamRef.genderNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -691,13 +719,13 @@
                 ${_conditionType_} a.photoPath is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('photoPathList')">
+        <if test="conditionParamRef.containsKey('photoPathList') and conditionParamRef.photoPathList.size() > 0">
             ${_conditionType_} a.photoPath in
             <foreach collection="conditionParamRef.photoPathList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('photoPathNotList')">
+        <if test="conditionParamRef.containsKey('photoPathNotList') and conditionParamRef.photoPathNotList.size() > 0">
             ${_conditionType_} a.photoPath not in
             <foreach collection="conditionParamRef.photoPathNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -712,13 +740,13 @@
                 ${_conditionType_} a.phoneNumber is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('phoneNumberList')">
+        <if test="conditionParamRef.containsKey('phoneNumberList') and conditionParamRef.phoneNumberList.size() > 0">
             ${_conditionType_} a.phoneNumber in
             <foreach collection="conditionParamRef.phoneNumberList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('phoneNumberNotList')">
+        <if test="conditionParamRef.containsKey('phoneNumberNotList') and conditionParamRef.phoneNumberNotList.size() > 0">
             ${_conditionType_} a.phoneNumber not in
             <foreach collection="conditionParamRef.phoneNumberNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -733,13 +761,13 @@
                 ${_conditionType_} a.idCard is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('idCardList')">
+        <if test="conditionParamRef.containsKey('idCardList') and conditionParamRef.idCardList.size() > 0">
             ${_conditionType_} a.idCard in
             <foreach collection="conditionParamRef.idCardList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('idCardNotList')">
+        <if test="conditionParamRef.containsKey('idCardNotList') and conditionParamRef.idCardNotList.size() > 0">
             ${_conditionType_} a.idCard not in
             <foreach collection="conditionParamRef.idCardNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -754,13 +782,13 @@
                 ${_conditionType_} a.workNum is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('workNumList')">
+        <if test="conditionParamRef.containsKey('workNumList') and conditionParamRef.workNumList.size() > 0">
             ${_conditionType_} a.workNum in
             <foreach collection="conditionParamRef.workNumList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('workNumNotList')">
+        <if test="conditionParamRef.containsKey('workNumNotList') and conditionParamRef.workNumNotList.size() > 0">
             ${_conditionType_} a.workNum not in
             <foreach collection="conditionParamRef.workNumNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -774,13 +802,13 @@
                 ${_conditionType_} a.politicalstatus is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('politicalstatusList')">
+        <if test="conditionParamRef.containsKey('politicalstatusList') and conditionParamRef.politicalstatusList.size() > 0">
             ${_conditionType_} a.politicalstatus in
             <foreach collection="conditionParamRef.politicalstatusList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('politicalstatusNotList')">
+        <if test="conditionParamRef.containsKey('politicalstatusNotList') and conditionParamRef.politicalstatusNotList.size() > 0">
             ${_conditionType_} a.politicalstatus not in
             <foreach collection="conditionParamRef.politicalstatusNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -801,13 +829,13 @@
                 ${_conditionType_} a.deptId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('deptIdList')">
+        <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
             ${_conditionType_} a.deptId in
             <foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('deptIdNotList')">
+        <if test="conditionParamRef.containsKey('deptIdNotList') and conditionParamRef.deptIdNotList.size() > 0">
             ${_conditionType_} a.deptId not in
             <foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -829,13 +857,13 @@
                 ${_conditionType_} a.deptName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('deptNameList')">
+        <if test="conditionParamRef.containsKey('deptNameList') and conditionParamRef.deptNameList.size() > 0">
             ${_conditionType_} a.deptName in
             <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('deptNameNotList')">
+        <if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
             ${_conditionType_} a.deptName not in
             <foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -849,13 +877,13 @@
                 ${_conditionType_} a.positionId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('positionIdList')">
+        <if test="conditionParamRef.containsKey('positionIdList') and conditionParamRef.positionIdList.size() > 0">
             ${_conditionType_} a.positionId in
             <foreach collection="conditionParamRef.positionIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('positionIdNotList')">
+        <if test="conditionParamRef.containsKey('positionIdNotList') and conditionParamRef.positionIdNotList.size() > 0">
             ${_conditionType_} a.positionId not in
             <foreach collection="conditionParamRef.positionIdNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -877,13 +905,13 @@
                 ${_conditionType_} a.positionName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('positionNameList')">
+        <if test="conditionParamRef.containsKey('positionNameList') and conditionParamRef.positionNameList.size() > 0">
             ${_conditionType_} a.positionName in
             <foreach collection="conditionParamRef.positionNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('positionNameNotList')">
+        <if test="conditionParamRef.containsKey('positionNameNotList') and conditionParamRef.positionNameNotList.size() > 0">
             ${_conditionType_} a.positionName not in
             <foreach collection="conditionParamRef.positionNameNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -897,13 +925,13 @@
                 ${_conditionType_} a.staffType is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('staffTypeList')">
+        <if test="conditionParamRef.containsKey('staffTypeList') and conditionParamRef.staffTypeList.size() > 0">
             ${_conditionType_} a.staffType in
             <foreach collection="conditionParamRef.staffTypeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('staffTypeNotList')">
+        <if test="conditionParamRef.containsKey('staffTypeNotList') and conditionParamRef.staffTypeNotList.size() > 0">
             ${_conditionType_} a.staffType not in
             <foreach collection="conditionParamRef.staffTypeNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -924,13 +952,13 @@
                 ${_conditionType_} a.status is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('statusList')">
+        <if test="conditionParamRef.containsKey('statusList') and conditionParamRef.statusList.size() > 0">
             ${_conditionType_} a.status in
             <foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('statusNotList')">
+        <if test="conditionParamRef.containsKey('statusNotList') and conditionParamRef.statusNotList.size() > 0">
             ${_conditionType_} a.status not in
             <foreach collection="conditionParamRef.statusNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -952,13 +980,13 @@
                 ${_conditionType_} a.registerPath is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('registerPathList')">
+        <if test="conditionParamRef.containsKey('registerPathList') and conditionParamRef.registerPathList.size() > 0">
             ${_conditionType_} a.registerPath in
             <foreach collection="conditionParamRef.registerPathList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('registerPathNotList')">
+        <if test="conditionParamRef.containsKey('registerPathNotList') and conditionParamRef.registerPathNotList.size() > 0">
             ${_conditionType_} a.registerPath not in
             <foreach collection="conditionParamRef.registerPathNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -1018,13 +1046,13 @@
                 ${_conditionType_} a.remark is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('remarkList')">
+        <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
             ${_conditionType_} a.remark in
             <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('remarkNotList')">
+        <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
             ${_conditionType_} a.remark not in
             <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -1038,13 +1066,13 @@
                 ${_conditionType_} a.createUserId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('createUserIdList')">
+        <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
             ${_conditionType_} a.createUserId in
             <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('createUserIdNotList')">
+        <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
             ${_conditionType_} a.createUserId not in
             <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -1080,13 +1108,13 @@
                 ${_conditionType_} a.updateUserId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('updateUserIdList')">
+        <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
             ${_conditionType_} a.updateUserId in
             <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('updateUserIdNotList')">
+        <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
             ${_conditionType_} a.updateUserId not in
             <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -1123,13 +1151,13 @@
                 ${_conditionType_} a.remarkId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('remarkIdList')">
+        <if test="conditionParamRef.containsKey('remarkIdList') and conditionParamRef.remarkIdList.size() > 0">
             ${_conditionType_} a.remarkId in
             <foreach collection="conditionParamRef.remarkIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('remarkIdNotList')">
+        <if test="conditionParamRef.containsKey('remarkIdNotList') and conditionParamRef.remarkIdNotList.size() > 0">
             ${_conditionType_} a.remarkId not in
             <foreach collection="conditionParamRef.remarkIdNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -1143,13 +1171,13 @@
                 ${_conditionType_} a.source is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('sourceList')">
+        <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
             ${_conditionType_} a.source in
             <foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('sourceNotList')">
+        <if test="conditionParamRef.containsKey('sourceNotList') and conditionParamRef.sourceNotList.size() > 0">
             ${_conditionType_} a.source not in
             <foreach collection="conditionParamRef.sourceNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -1162,6 +1190,48 @@
             ${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
         </if>
 
+
+        <if test="conditionParamRef.containsKey('picUri')">
+            <if test="conditionParamRef.picUri != null and conditionParamRef.picUri != ''">
+                ${_conditionType_} a.picUri like #{${_conditionParam_}.picUri}
+            </if>
+            <if test="conditionParamRef.picUri == null">
+                ${_conditionType_} a.picUri is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('picUriList') and conditionParamRef.picUriList.size() > 0">
+            ${_conditionType_} a.picUri in
+            <foreach collection="conditionParamRef.picUriList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('picUriNotList') and conditionParamRef.picUriNotList.size() > 0">
+            ${_conditionType_} a.picUri not in
+            <foreach collection="conditionParamRef.picUriNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('serverIndexCode')">
+            <if test="conditionParamRef.serverIndexCode != null and conditionParamRef.serverIndexCode != ''">
+                ${_conditionType_} a.serverIndexCode like #{${_conditionParam_}.serverIndexCode}
+            </if>
+            <if test="conditionParamRef.serverIndexCode == null">
+                ${_conditionType_} a.serverIndexCode is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('serverIndexCodeList') and conditionParamRef.serverIndexCodeList.size() > 0">
+            ${_conditionType_} a.serverIndexCode in
+            <foreach collection="conditionParamRef.serverIndexCodeList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('serverIndexCodeNotList') and conditionParamRef.serverIndexCodeNotList.size() > 0">
+            ${_conditionType_} a.serverIndexCode not in
+            <foreach collection="conditionParamRef.serverIndexCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1305,6 +1375,16 @@
                     <if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('picUri')">
+                    a.picUri
+                    <if test='orderCol.picUri != null and "DESC".equalsIgnoreCase(orderCol.picUri)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('serverIndexCode')">
+                    a.serverIndexCode
+                    <if test='orderCol.serverIndexCode != null and "DESC".equalsIgnoreCase(orderCol.serverIndexCode)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>
@@ -1343,5 +1423,4 @@
     <select id="queryHik" resultType="com.mortals.xhx.module.staff.model.StaffEntity">
         select * from mortals_xhx_staff where remarkId = #{remarkId}
     </select>
-
 </mapper>
\ No newline at end of file

db/module.sql

@@ -54,6 +54,8 @@ CREATE TABLE mortals_xhx_staff(
                                   `updateTime` datetime      COMMENT '更新时间',
                                   `remarkId` varchar(255)      COMMENT '备注id',
                                   `source` tinyint(2)    DEFAULT '1'  COMMENT '员工来源(1.外部,2.内部)',
+                                  `picUri` varchar(255)      COMMENT '相对图片pic',
+                                  `serverIndexCode` varchar(255)      COMMENT '图片资源唯一标识',
                                   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工基本信息';