工作人员添加经办人id

base-manager/db/add.sql

@@ -9,3 +9,9 @@ ALTER TABLE mortals_sys_window ADD COLUMN `dutyEnglish` varchar (256)  default "
 ALTER TABLE mortals_sys_dept ADD COLUMN  `total` int(9)    DEFAULT '0' COMMENT '关联事项数量' AFTER updateTime;
 
 INSERT INTO `mortals_xhx_task` VALUES (null, '统计站点部门事项数', 'StatSiteDeptMatterTask', 0, 'StatSiteDeptMatterTask', NULL, NULL, 1, 0, '23:21', NULL, '172.17.0.1', '2023-03-05 23:21:01', 0, NULL, NULL, NULL);
+
+
+-- ----------------------------
+2023-3-11
+-- ----------------------------
+ALTER TABLE mortals_sys_workman ADD COLUMN  `operatorId` varchar (128) default ""  COMMENT '一体化经办人id' AFTER modelIds;

base-manager/doc/api.md

@@ -4939,6 +4939,7 @@ name|String|部门名称|否|-
 deptAbb|String|部门简称|否|-
 deptNumber|String|部门编号|否|-
 filter|Integer|是否过滤没有事项的部门(0.否，1.是)|否|-
+isBkb|Integer|背靠背展示 (0.否，1.是)|否|-
 
 **请求样例:**
 
@@ -5665,6 +5666,8 @@ siteName|String|站点名称|否|-
 name|String|姓名|否|-
 number|String|工号|否|-
 modelIds|String|模块id,逗号分隔|否|-
+modelIds|String|模块id,逗号分隔|否|-
+
 
 **请求样例:**
 
@@ -5726,6 +5729,7 @@ data|object|数据对象|-
   createTime|Date|创建时间|-
   createUserId|Long|创建用户|-
   updateTime|Date|修改时间|-
+  operatorId|String|一体化经办人id|-
 dict|object|字典对象|-
  online|object|字典属性对象，详见附录|-
 
@@ -5806,6 +5810,7 @@ data|object|数据对象|-
  createTime|Date|创建时间|-
  createUserId|Long|创建用户|-
  updateTime|Date|修改时间|-
+ operatorId|String|一体化经办人id|-
 dict|object|字典对象|-
  online|object|字典属性对象，详见附录|-
 
@@ -5855,6 +5860,7 @@ promise| String  | 服务承诺               bn nb                  | 是   |-
 business| String  | 办理事项                                      | 是   |-
 modelIds| String  | 模块ids                                     | 是   |-
 online| Integer | 是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）     | 是   |-
+operatorId|String|一体化经办人id|否|-
 
 **请求样例:**
 
@@ -5893,6 +5899,7 @@ data|object|数据对象|-
   promise|String|服务承诺|-
   business|String|办理事项|-
   online|Integer|是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）|-
+  operatorId|String|一体化经办人id|-
   createTime|Date|创建时间|-
   createUserId|Long|创建用户|-
   updateTime|Date|修改时间|-

base-manager/src/main/java/com/mortals/xhx/module/workman/model/WorkmanEntity.java

@@ -143,7 +143,10 @@ public class WorkmanEntity extends WorkmanVo {
      * 最后一次登录地址
      */
     private String lastLoginAddress;
-
+    /**
+     * 一体化经办人id
+     */
+    private String operatorId;
 
 
     public WorkmanEntity(){}
@@ -540,6 +543,20 @@ public class WorkmanEntity extends WorkmanVo {
         this.lastLoginAddress = lastLoginAddress;
     }
 
+    /**
+     * 获取 一体化经办人id
+     * @return String
+     */
+    public String getOperatorId(){
+        return operatorId;
+    }
+    /**
+     * 设置 一体化经办人id
+     * @param operatorId
+     */
+    public void setOperatorId(String operatorId){
+        this.operatorId = operatorId;
+    }
 
 
 

base-manager/src/main/java/com/mortals/xhx/module/workman/model/WorkmanQuery.java

@@ -7,7 +7,7 @@ import com.mortals.xhx.module.workman.model.WorkmanEntity;
  * 工作人员查询对象
  *
  * @author zxfei
- * @date 2022-12-23
+ * @date 2023-03-13
  */
 public class WorkmanQuery extends WorkmanEntity {
     /** 开始 序号，主键，自增长 */
@@ -22,12 +22,19 @@ public class WorkmanQuery extends WorkmanEntity {
     /** 序号，主键，自增长列表 */
     private List <Long> idList;
 
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
     /** 登录用户名 */
     private List<String> loginNameList;
 
+    /** 登录用户名排除列表 */
+    private List <String> loginNameNotList;
     /** 密码 */
     private List<String> loginPwdList;
 
+    /** 密码排除列表 */
+    private List <String> loginPwdNotList;
     /** 开始 部门id号 */
     private Long deptIdStart;
 
@@ -40,9 +47,14 @@ public class WorkmanQuery extends WorkmanEntity {
     /** 部门id号列表 */
     private List <Long> deptIdList;
 
+    /** 部门id号排除列表 */
+    private List <Long> deptIdNotList;
+
     /** 部门名称 */
     private List<String> deptNameList;
 
+    /** 部门名称排除列表 */
+    private List <String> deptNameNotList;
     /** 开始 窗口id号 */
     private Long windowIdStart;
 
@@ -55,9 +67,14 @@ public class WorkmanQuery extends WorkmanEntity {
     /** 窗口id号列表 */
     private List <Long> windowIdList;
 
+    /** 窗口id号排除列表 */
+    private List <Long> windowIdNotList;
+
     /** 窗口名称 */
     private List<String> windowNameList;
 
+    /** 窗口名称排除列表 */
+    private List <String> windowNameNotList;
     /** 开始 站点ID */
     private Long siteIdStart;
 
@@ -70,21 +87,34 @@ public class WorkmanQuery extends WorkmanEntity {
     /** 站点ID列表 */
     private List <Long> siteIdList;
 
+    /** 站点ID排除列表 */
+    private List <Long> siteIdNotList;
+
     /** 站点名称 */
     private List<String> siteNameList;
 
+    /** 站点名称排除列表 */
+    private List <String> siteNameNotList;
     /** 姓名 */
     private List<String> nameList;
 
+    /** 姓名排除列表 */
+    private List <String> nameNotList;
     /** 工号 */
     private List<String> numberList;
 
+    /** 工号排除列表 */
+    private List <String> numberNotList;
     /** 职务 */
     private List<String> userpostList;
 
+    /** 职务排除列表 */
+    private List <String> userpostNotList;
     /** 职称 */
     private List<String> posttitleList;
 
+    /** 职称排除列表 */
+    private List <String> posttitleNotList;
     /** 开始 政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它) */
     private Integer politicalstatusStart;
 
@@ -97,6 +127,9 @@ public class WorkmanQuery extends WorkmanEntity {
     /** 政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)列表 */
     private List <Integer> politicalstatusList;
 
+    /** 政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)排除列表 */
+    private List <Integer> politicalstatusNotList;
+
     /** 开始 党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗) */
     private Integer dangyuanStart;
 
@@ -109,18 +142,29 @@ public class WorkmanQuery extends WorkmanEntity {
     /** 党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)列表 */
     private List <Integer> dangyuanList;
 
+    /** 党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)排除列表 */
+    private List <Integer> dangyuanNotList;
+
     /** 党员扩展 */
     private List<String> dangyuanextList;
 
+    /** 党员扩展排除列表 */
+    private List <String> dangyuanextNotList;
     /** 身份证 */
     private List<String> idCardList;
 
+    /** 身份证排除列表 */
+    private List <String> idCardNotList;
     /** 电话 */
     private List<String> phoneList;
 
+    /** 电话排除列表 */
+    private List <String> phoneNotList;
     /** 手机 */
     private List<String> mobileList;
 
+    /** 手机排除列表 */
+    private List <String> mobileNotList;
     /** 开始 星级 */
     private Integer starlevelStart;
 
@@ -133,21 +177,34 @@ public class WorkmanQuery extends WorkmanEntity {
     /** 星级列表 */
     private List <Integer> starlevelList;
 
+    /** 星级排除列表 */
+    private List <Integer> starlevelNotList;
+
     /** 个人简介 */
     private List<String> summaryList;
 
+    /** 个人简介排除列表 */
+    private List <String> summaryNotList;
     /** 照片 */
     private List<String> photoPathList;
 
+    /** 照片排除列表 */
+    private List <String> photoPathNotList;
     /** 岗位职责 */
     private List<String> dutyList;
 
+    /** 岗位职责排除列表 */
+    private List <String> dutyNotList;
     /** 服务承诺 */
     private List<String> promiseList;
 
+    /** 服务承诺排除列表 */
+    private List <String> promiseNotList;
     /** 办理事项 */
     private List<String> businessList;
 
+    /** 办理事项排除列表 */
+    private List <String> businessNotList;
     /** 开始 是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆） */
     private Integer onlineStart;
 
@@ -160,9 +217,14 @@ public class WorkmanQuery extends WorkmanEntity {
     /** 是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）列表 */
     private List <Integer> onlineList;
 
+    /** 是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）排除列表 */
+    private List <Integer> onlineNotList;
+
     /** 配置站点模块，逗号分隔 */
     private List<String> modelIdsList;
 
+    /** 配置站点模块，逗号分隔排除列表 */
+    private List <String> modelIdsNotList;
     /** 开始 创建时间 */
     private String createTimeStart;
 
@@ -181,6 +243,9 @@ public class WorkmanQuery extends WorkmanEntity {
     /** 创建用户列表 */
     private List <Long> createUserIdList;
 
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
     /** 开始 修改时间 */
     private String updateTimeStart;
 
@@ -196,6 +261,13 @@ public class WorkmanQuery extends WorkmanEntity {
     /** 最后一次登录地址 */
     private List<String> lastLoginAddressList;
 
+    /** 最后一次登录地址排除列表 */
+    private List <String> lastLoginAddressNotList;
+    /** 一体化经办人id */
+    private List<String> operatorIdList;
+
+    /** 一体化经办人id排除列表 */
+    private List <String> operatorIdNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<WorkmanQuery> orConditionList;
 
@@ -268,6 +340,23 @@ public class WorkmanQuery extends WorkmanEntity {
         this.idList = idList;
     }
 
+    /**
+     * 获取 序号，主键，自增长
+     * @return idNotList
+     */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
     /**
      * 获取 登录用户名
      * @return loginNameList
@@ -283,6 +372,23 @@ public class WorkmanQuery extends WorkmanEntity {
     public void setLoginNameList(List<String> loginNameList){
         this.loginNameList = loginNameList;
     }
+
+    /**
+     * 获取 登录用户名
+     * @return loginNameNotList
+     */
+    public List<String> getLoginNameNotList(){
+        return this.loginNameNotList;
+    }
+
+    /**
+     * 设置 登录用户名
+     * @param loginNameNotList
+     */
+    public void setLoginNameNotList(List<String> loginNameNotList){
+        this.loginNameNotList = loginNameNotList;
+    }
+
     /**
      * 获取 密码
      * @return loginPwdList
@@ -298,6 +404,23 @@ public class WorkmanQuery extends WorkmanEntity {
     public void setLoginPwdList(List<String> loginPwdList){
         this.loginPwdList = loginPwdList;
     }
+
+    /**
+     * 获取 密码
+     * @return loginPwdNotList
+     */
+    public List<String> getLoginPwdNotList(){
+        return this.loginPwdNotList;
+    }
+
+    /**
+     * 设置 密码
+     * @param loginPwdNotList
+     */
+    public void setLoginPwdNotList(List<String> loginPwdNotList){
+        this.loginPwdNotList = loginPwdNotList;
+    }
+
     /**
      * 获取 开始 部门id号
      * @return deptIdStart
@@ -362,6 +485,23 @@ public class WorkmanQuery extends WorkmanEntity {
         this.deptIdList = deptIdList;
     }
 
+    /**
+     * 获取 部门id号
+     * @return deptIdNotList
+     */
+    public List<Long> getDeptIdNotList(){
+        return this.deptIdNotList;
+    }
+
+    /**
+     * 设置 部门id号
+     * @param deptIdNotList
+     */
+    public void setDeptIdNotList(List<Long> deptIdNotList){
+        this.deptIdNotList = deptIdNotList;
+    }
+
+
     /**
      * 获取 部门名称
      * @return deptNameList
@@ -377,6 +517,23 @@ public class WorkmanQuery extends WorkmanEntity {
     public void setDeptNameList(List<String> deptNameList){
         this.deptNameList = deptNameList;
     }
+
+    /**
+     * 获取 部门名称
+     * @return deptNameNotList
+     */
+    public List<String> getDeptNameNotList(){
+        return this.deptNameNotList;
+    }
+
+    /**
+     * 设置 部门名称
+     * @param deptNameNotList
+     */
+    public void setDeptNameNotList(List<String> deptNameNotList){
+        this.deptNameNotList = deptNameNotList;
+    }
+
     /**
      * 获取 开始 窗口id号
      * @return windowIdStart
@@ -441,6 +598,23 @@ public class WorkmanQuery extends WorkmanEntity {
         this.windowIdList = windowIdList;
     }
 
+    /**
+     * 获取 窗口id号
+     * @return windowIdNotList
+     */
+    public List<Long> getWindowIdNotList(){
+        return this.windowIdNotList;
+    }
+
+    /**
+     * 设置 窗口id号
+     * @param windowIdNotList
+     */
+    public void setWindowIdNotList(List<Long> windowIdNotList){
+        this.windowIdNotList = windowIdNotList;
+    }
+
+
     /**
      * 获取 窗口名称
      * @return windowNameList
@@ -456,6 +630,23 @@ public class WorkmanQuery extends WorkmanEntity {
     public void setWindowNameList(List<String> windowNameList){
         this.windowNameList = windowNameList;
     }
+
+    /**
+     * 获取 窗口名称
+     * @return windowNameNotList
+     */
+    public List<String> getWindowNameNotList(){
+        return this.windowNameNotList;
+    }
+
+    /**
+     * 设置 窗口名称
+     * @param windowNameNotList
+     */
+    public void setWindowNameNotList(List<String> windowNameNotList){
+        this.windowNameNotList = windowNameNotList;
+    }
+
     /**
      * 获取 开始 站点ID
      * @return siteIdStart
@@ -520,6 +711,23 @@ public class WorkmanQuery extends WorkmanEntity {
         this.siteIdList = siteIdList;
     }
 
+    /**
+     * 获取 站点ID
+     * @return siteIdNotList
+     */
+    public List<Long> getSiteIdNotList(){
+        return this.siteIdNotList;
+    }
+
+    /**
+     * 设置 站点ID
+     * @param siteIdNotList
+     */
+    public void setSiteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+    }
+
+
     /**
      * 获取 站点名称
      * @return siteNameList
@@ -535,6 +743,23 @@ public class WorkmanQuery extends WorkmanEntity {
     public void setSiteNameList(List<String> siteNameList){
         this.siteNameList = siteNameList;
     }
+
+    /**
+     * 获取 站点名称
+     * @return siteNameNotList
+     */
+    public List<String> getSiteNameNotList(){
+        return this.siteNameNotList;
+    }
+
+    /**
+     * 设置 站点名称
+     * @param siteNameNotList
+     */
+    public void setSiteNameNotList(List<String> siteNameNotList){
+        this.siteNameNotList = siteNameNotList;
+    }
+
     /**
      * 获取 姓名
      * @return nameList
@@ -550,6 +775,23 @@ public class WorkmanQuery extends WorkmanEntity {
     public void setNameList(List<String> nameList){
         this.nameList = nameList;
     }
+
+    /**
+     * 获取 姓名
+     * @return nameNotList
+     */
+    public List<String> getNameNotList(){
+        return this.nameNotList;
+    }
+
+    /**
+     * 设置 姓名
+     * @param nameNotList
+     */
+    public void setNameNotList(List<String> nameNotList){
+        this.nameNotList = nameNotList;
+    }
+
     /**
      * 获取 工号
      * @return numberList
@@ -565,6 +807,23 @@ public class WorkmanQuery extends WorkmanEntity {
     public void setNumberList(List<String> numberList){
         this.numberList = numberList;
     }
+
+    /**
+     * 获取 工号
+     * @return numberNotList
+     */
+    public List<String> getNumberNotList(){
+        return this.numberNotList;
+    }
+
+    /**
+     * 设置 工号
+     * @param numberNotList
+     */
+    public void setNumberNotList(List<String> numberNotList){
+        this.numberNotList = numberNotList;
+    }
+
     /**
      * 获取 职务
      * @return userpostList
@@ -580,6 +839,23 @@ public class WorkmanQuery extends WorkmanEntity {
     public void setUserpostList(List<String> userpostList){
         this.userpostList = userpostList;
     }
+
+    /**
+     * 获取 职务
+     * @return userpostNotList
+     */
+    public List<String> getUserpostNotList(){
+        return this.userpostNotList;
+    }
+
+    /**
+     * 设置 职务
+     * @param userpostNotList
+     */
+    public void setUserpostNotList(List<String> userpostNotList){
+        this.userpostNotList = userpostNotList;
+    }
+
     /**
      * 获取 职称
      * @return posttitleList
@@ -595,6 +871,23 @@ public class WorkmanQuery extends WorkmanEntity {
     public void setPosttitleList(List<String> posttitleList){
         this.posttitleList = posttitleList;
     }
+
+    /**
+     * 获取 职称
+     * @return posttitleNotList
+     */
+    public List<String> getPosttitleNotList(){
+        return this.posttitleNotList;
+    }
+
+    /**
+     * 设置 职称
+     * @param posttitleNotList
+     */
+    public void setPosttitleNotList(List<String> posttitleNotList){
+        this.posttitleNotList = posttitleNotList;
+    }
+
     /**
      * 获取 开始 政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)
      * @return politicalstatusStart
@@ -659,6 +952,23 @@ public class WorkmanQuery extends WorkmanEntity {
         this.politicalstatusList = politicalstatusList;
     }
 
+    /**
+     * 获取 政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)
+     * @return politicalstatusNotList
+     */
+    public List<Integer> getPoliticalstatusNotList(){
+        return this.politicalstatusNotList;
+    }
+
+    /**
+     * 设置 政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)
+     * @param politicalstatusNotList
+     */
+    public void setPoliticalstatusNotList(List<Integer> politicalstatusNotList){
+        this.politicalstatusNotList = politicalstatusNotList;
+    }
+
+
     /**
      * 获取 开始 党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)
      * @return dangyuanStart
@@ -723,6 +1033,23 @@ public class WorkmanQuery extends WorkmanEntity {
         this.dangyuanList = dangyuanList;
     }
 
+    /**
+     * 获取 党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)
+     * @return dangyuanNotList
+     */
+    public List<Integer> getDangyuanNotList(){
+        return this.dangyuanNotList;
+    }
+
+    /**
+     * 设置 党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)
+     * @param dangyuanNotList
+     */
+    public void setDangyuanNotList(List<Integer> dangyuanNotList){
+        this.dangyuanNotList = dangyuanNotList;
+    }
+
+
     /**
      * 获取 党员扩展
      * @return dangyuanextList
@@ -738,6 +1065,23 @@ public class WorkmanQuery extends WorkmanEntity {
     public void setDangyuanextList(List<String> dangyuanextList){
         this.dangyuanextList = dangyuanextList;
     }
+
+    /**
+     * 获取 党员扩展
+     * @return dangyuanextNotList
+     */
+    public List<String> getDangyuanextNotList(){
+        return this.dangyuanextNotList;
+    }
+
+    /**
+     * 设置 党员扩展
+     * @param dangyuanextNotList
+     */
+    public void setDangyuanextNotList(List<String> dangyuanextNotList){
+        this.dangyuanextNotList = dangyuanextNotList;
+    }
+
     /**
      * 获取 身份证
      * @return idCardList
@@ -753,6 +1097,23 @@ public class WorkmanQuery extends WorkmanEntity {
     public void setIdCardList(List<String> idCardList){
         this.idCardList = idCardList;
     }
+
+    /**
+     * 获取 身份证
+     * @return idCardNotList
+     */
+    public List<String> getIdCardNotList(){
+        return this.idCardNotList;
+    }
+
+    /**
+     * 设置 身份证
+     * @param idCardNotList
+     */
+    public void setIdCardNotList(List<String> idCardNotList){
+        this.idCardNotList = idCardNotList;
+    }
+
     /**
      * 获取 电话
      * @return phoneList
@@ -768,6 +1129,23 @@ public class WorkmanQuery extends WorkmanEntity {
     public void setPhoneList(List<String> phoneList){
         this.phoneList = phoneList;
     }
+
+    /**
+     * 获取 电话
+     * @return phoneNotList
+     */
+    public List<String> getPhoneNotList(){
+        return this.phoneNotList;
+    }
+
+    /**
+     * 设置 电话
+     * @param phoneNotList
+     */
+    public void setPhoneNotList(List<String> phoneNotList){
+        this.phoneNotList = phoneNotList;
+    }
+
     /**
      * 获取 手机
      * @return mobileList
@@ -783,6 +1161,23 @@ public class WorkmanQuery extends WorkmanEntity {
     public void setMobileList(List<String> mobileList){
         this.mobileList = mobileList;
     }
+
+    /**
+     * 获取 手机
+     * @return mobileNotList
+     */
+    public List<String> getMobileNotList(){
+        return this.mobileNotList;
+    }
+
+    /**
+     * 设置 手机
+     * @param mobileNotList
+     */
+    public void setMobileNotList(List<String> mobileNotList){
+        this.mobileNotList = mobileNotList;
+    }
+
     /**
      * 获取 开始 星级
      * @return starlevelStart
@@ -847,6 +1242,23 @@ public class WorkmanQuery extends WorkmanEntity {
         this.starlevelList = starlevelList;
     }
 
+    /**
+     * 获取 星级
+     * @return starlevelNotList
+     */
+    public List<Integer> getStarlevelNotList(){
+        return this.starlevelNotList;
+    }
+
+    /**
+     * 设置 星级
+     * @param starlevelNotList
+     */
+    public void setStarlevelNotList(List<Integer> starlevelNotList){
+        this.starlevelNotList = starlevelNotList;
+    }
+
+
     /**
      * 获取 个人简介
      * @return summaryList
@@ -862,6 +1274,23 @@ public class WorkmanQuery extends WorkmanEntity {
     public void setSummaryList(List<String> summaryList){
         this.summaryList = summaryList;
     }
+
+    /**
+     * 获取 个人简介
+     * @return summaryNotList
+     */
+    public List<String> getSummaryNotList(){
+        return this.summaryNotList;
+    }
+
+    /**
+     * 设置 个人简介
+     * @param summaryNotList
+     */
+    public void setSummaryNotList(List<String> summaryNotList){
+        this.summaryNotList = summaryNotList;
+    }
+
     /**
      * 获取 照片
      * @return photoPathList
@@ -877,6 +1306,23 @@ public class WorkmanQuery extends WorkmanEntity {
     public void setPhotoPathList(List<String> photoPathList){
         this.photoPathList = photoPathList;
     }
+
+    /**
+     * 获取 照片
+     * @return photoPathNotList
+     */
+    public List<String> getPhotoPathNotList(){
+        return this.photoPathNotList;
+    }
+
+    /**
+     * 设置 照片
+     * @param photoPathNotList
+     */
+    public void setPhotoPathNotList(List<String> photoPathNotList){
+        this.photoPathNotList = photoPathNotList;
+    }
+
     /**
      * 获取 岗位职责
      * @return dutyList
@@ -892,6 +1338,23 @@ public class WorkmanQuery extends WorkmanEntity {
     public void setDutyList(List<String> dutyList){
         this.dutyList = dutyList;
     }
+
+    /**
+     * 获取 岗位职责
+     * @return dutyNotList
+     */
+    public List<String> getDutyNotList(){
+        return this.dutyNotList;
+    }
+
+    /**
+     * 设置 岗位职责
+     * @param dutyNotList
+     */
+    public void setDutyNotList(List<String> dutyNotList){
+        this.dutyNotList = dutyNotList;
+    }
+
     /**
      * 获取 服务承诺
      * @return promiseList
@@ -907,6 +1370,23 @@ public class WorkmanQuery extends WorkmanEntity {
     public void setPromiseList(List<String> promiseList){
         this.promiseList = promiseList;
     }
+
+    /**
+     * 获取 服务承诺
+     * @return promiseNotList
+     */
+    public List<String> getPromiseNotList(){
+        return this.promiseNotList;
+    }
+
+    /**
+     * 设置 服务承诺
+     * @param promiseNotList
+     */
+    public void setPromiseNotList(List<String> promiseNotList){
+        this.promiseNotList = promiseNotList;
+    }
+
     /**
      * 获取 办理事项
      * @return businessList
@@ -922,6 +1402,23 @@ public class WorkmanQuery extends WorkmanEntity {
     public void setBusinessList(List<String> businessList){
         this.businessList = businessList;
     }
+
+    /**
+     * 获取 办理事项
+     * @return businessNotList
+     */
+    public List<String> getBusinessNotList(){
+        return this.businessNotList;
+    }
+
+    /**
+     * 设置 办理事项
+     * @param businessNotList
+     */
+    public void setBusinessNotList(List<String> businessNotList){
+        this.businessNotList = businessNotList;
+    }
+
     /**
      * 获取 开始 是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）
      * @return onlineStart
@@ -986,6 +1483,23 @@ public class WorkmanQuery extends WorkmanEntity {
         this.onlineList = onlineList;
     }
 
+    /**
+     * 获取 是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）
+     * @return onlineNotList
+     */
+    public List<Integer> getOnlineNotList(){
+        return this.onlineNotList;
+    }
+
+    /**
+     * 设置 是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）
+     * @param onlineNotList
+     */
+    public void setOnlineNotList(List<Integer> onlineNotList){
+        this.onlineNotList = onlineNotList;
+    }
+
+
     /**
      * 获取 配置站点模块，逗号分隔
      * @return modelIdsList
@@ -1001,6 +1515,23 @@ public class WorkmanQuery extends WorkmanEntity {
     public void setModelIdsList(List<String> modelIdsList){
         this.modelIdsList = modelIdsList;
     }
+
+    /**
+     * 获取 配置站点模块，逗号分隔
+     * @return modelIdsNotList
+     */
+    public List<String> getModelIdsNotList(){
+        return this.modelIdsNotList;
+    }
+
+    /**
+     * 设置 配置站点模块，逗号分隔
+     * @param modelIdsNotList
+     */
+    public void setModelIdsNotList(List<String> modelIdsNotList){
+        this.modelIdsNotList = modelIdsNotList;
+    }
+
     /**
      * 获取 开始 创建时间
      * @return createTimeStart
@@ -1097,6 +1628,23 @@ public class WorkmanQuery extends WorkmanEntity {
         this.createUserIdList = createUserIdList;
     }
 
+    /**
+     * 获取 创建用户
+     * @return createUserIdNotList
+     */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+    }
+
+
     /**
      * 获取 开始 修改时间
      * @return updateTimeStart
@@ -1176,6 +1724,55 @@ public class WorkmanQuery extends WorkmanEntity {
     public void setLastLoginAddressList(List<String> lastLoginAddressList){
         this.lastLoginAddressList = lastLoginAddressList;
     }
+
+    /**
+     * 获取 最后一次登录地址
+     * @return lastLoginAddressNotList
+     */
+    public List<String> getLastLoginAddressNotList(){
+        return this.lastLoginAddressNotList;
+    }
+
+    /**
+     * 设置 最后一次登录地址
+     * @param lastLoginAddressNotList
+     */
+    public void setLastLoginAddressNotList(List<String> lastLoginAddressNotList){
+        this.lastLoginAddressNotList = lastLoginAddressNotList;
+    }
+
+    /**
+     * 获取 一体化经办人id
+     * @return operatorIdList
+     */
+    public List<String> getOperatorIdList(){
+        return this.operatorIdList;
+    }
+
+    /**
+     * 设置 一体化经办人id
+     * @param operatorIdList
+     */
+    public void setOperatorIdList(List<String> operatorIdList){
+        this.operatorIdList = operatorIdList;
+    }
+
+    /**
+     * 获取 一体化经办人id
+     * @return operatorIdNotList
+     */
+    public List<String> getOperatorIdNotList(){
+        return this.operatorIdNotList;
+    }
+
+    /**
+     * 设置 一体化经办人id
+     * @param operatorIdNotList
+     */
+    public void setOperatorIdNotList(List<String> operatorIdNotList){
+        this.operatorIdNotList = operatorIdNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -1221,6 +1818,15 @@ public class WorkmanQuery extends WorkmanEntity {
         return this;
     }
 
+    /**
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public WorkmanQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+    }
+
 
     /**
      * 设置 登录用户名
@@ -1304,6 +1910,15 @@ public class WorkmanQuery extends WorkmanEntity {
         return this;
     }
 
+    /**
+     * 设置 部门id号
+     * @param deptIdNotList
+     */
+    public WorkmanQuery deptIdNotList(List<Long> deptIdNotList){
+        this.deptIdNotList = deptIdNotList;
+        return this;
+    }
+
 
     /**
      * 设置 部门名称
@@ -1368,6 +1983,15 @@ public class WorkmanQuery extends WorkmanEntity {
         return this;
     }
 
+    /**
+     * 设置 窗口id号
+     * @param windowIdNotList
+     */
+    public WorkmanQuery windowIdNotList(List<Long> windowIdNotList){
+        this.windowIdNotList = windowIdNotList;
+        return this;
+    }
+
 
     /**
      * 设置 窗口名称
@@ -1432,6 +2056,15 @@ public class WorkmanQuery extends WorkmanEntity {
         return this;
     }
 
+    /**
+     * 设置 站点ID
+     * @param siteIdNotList
+     */
+    public WorkmanQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+    }
+
 
     /**
      * 设置 站点名称
@@ -1572,6 +2205,15 @@ public class WorkmanQuery extends WorkmanEntity {
         return this;
     }
 
+    /**
+     * 设置 政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)
+     * @param politicalstatusNotList
+     */
+    public WorkmanQuery politicalstatusNotList(List<Integer> politicalstatusNotList){
+        this.politicalstatusNotList = politicalstatusNotList;
+        return this;
+    }
+
     /**
      * 设置  党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)
      * @param dangyuan
@@ -1617,6 +2259,15 @@ public class WorkmanQuery extends WorkmanEntity {
         return this;
     }
 
+    /**
+     * 设置 党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)
+     * @param dangyuanNotList
+     */
+    public WorkmanQuery dangyuanNotList(List<Integer> dangyuanNotList){
+        this.dangyuanNotList = dangyuanNotList;
+        return this;
+    }
+
 
     /**
      * 设置 党员扩展
@@ -1738,6 +2389,15 @@ public class WorkmanQuery extends WorkmanEntity {
         return this;
     }
 
+    /**
+     * 设置 星级
+     * @param starlevelNotList
+     */
+    public WorkmanQuery starlevelNotList(List<Integer> starlevelNotList){
+        this.starlevelNotList = starlevelNotList;
+        return this;
+    }
+
 
     /**
      * 设置 个人简介
@@ -1878,6 +2538,15 @@ public class WorkmanQuery extends WorkmanEntity {
         return this;
     }
 
+    /**
+     * 设置 是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）
+     * @param onlineNotList
+     */
+    public WorkmanQuery onlineNotList(List<Integer> onlineNotList){
+        this.onlineNotList = onlineNotList;
+        return this;
+    }
+
 
     /**
      * 设置 配置站点模块，逗号分隔
@@ -1943,6 +2612,15 @@ public class WorkmanQuery extends WorkmanEntity {
         return this;
     }
 
+    /**
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
+    public WorkmanQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+    }
+
 
 
 
@@ -1964,6 +2642,25 @@ public class WorkmanQuery extends WorkmanEntity {
         return this;
     }
 
+
+    /**
+     * 设置 一体化经办人id
+     * @param operatorId
+     */
+    public WorkmanQuery operatorId(String operatorId){
+        setOperatorId(operatorId);
+        return this;
+    }
+
+    /**
+     * 设置 一体化经办人id
+     * @param operatorIdList
+     */
+    public WorkmanQuery operatorIdList(List<String> operatorIdList){
+        this.operatorIdList = operatorIdList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

base-manager/src/main/resources/sqlmap/module/workman/WorkmanMapper.xml

@@ -37,6 +37,7 @@
         <result property="updateTime" column="updateTime" />
         <result property="lastLoginTime" column="lastLoginTime" />
         <result property="lastLoginAddress" column="lastLoginAddress" />
+        <result property="operatorId" column="operatorId" />
 
     </resultMap>
 
@@ -140,23 +141,26 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lastLoginAddress') or colPickMode == 1 and data.containsKey('lastLoginAddress')))">
                 a.lastLoginAddress,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('operatorId') or colPickMode == 1 and data.containsKey('operatorId')))">
+                a.operatorId,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="WorkmanEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_sys_workman
-        (loginName,loginPwd,deptId,deptName,windowId,windowName,siteId,siteName,name,number,userpost,posttitle,politicalstatus,dangyuan,dangyuanext,idCard,phone,mobile,starlevel,summary,photoPath,duty,promise,business,online,modelIds,createTime,createUserId,updateTime,lastLoginTime,lastLoginAddress)
+        (loginName,loginPwd,deptId,deptName,windowId,windowName,siteId,siteName,name,number,userpost,posttitle,politicalstatus,dangyuan,dangyuanext,idCard,phone,mobile,starlevel,summary,photoPath,duty,promise,business,online,modelIds,createTime,createUserId,updateTime,lastLoginTime,lastLoginAddress,operatorId)
         VALUES
-        (#{loginName},#{loginPwd},#{deptId},#{deptName},#{windowId},#{windowName},#{siteId},#{siteName},#{name},#{number},#{userpost},#{posttitle},#{politicalstatus},#{dangyuan},#{dangyuanext},#{idCard},#{phone},#{mobile},#{starlevel},#{summary},#{photoPath},#{duty},#{promise},#{business},#{online},#{modelIds},#{createTime},#{createUserId},#{updateTime},#{lastLoginTime},#{lastLoginAddress})
+        (#{loginName},#{loginPwd},#{deptId},#{deptName},#{windowId},#{windowName},#{siteId},#{siteName},#{name},#{number},#{userpost},#{posttitle},#{politicalstatus},#{dangyuan},#{dangyuanext},#{idCard},#{phone},#{mobile},#{starlevel},#{summary},#{photoPath},#{duty},#{promise},#{business},#{online},#{modelIds},#{createTime},#{createUserId},#{updateTime},#{lastLoginTime},#{lastLoginAddress},#{operatorId})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_sys_workman
-        (loginName,loginPwd,deptId,deptName,windowId,windowName,siteId,siteName,name,number,userpost,posttitle,politicalstatus,dangyuan,dangyuanext,idCard,phone,mobile,starlevel,summary,photoPath,duty,promise,business,online,modelIds,createTime,createUserId,updateTime,lastLoginTime,lastLoginAddress)
+        (loginName,loginPwd,deptId,deptName,windowId,windowName,siteId,siteName,name,number,userpost,posttitle,politicalstatus,dangyuan,dangyuanext,idCard,phone,mobile,starlevel,summary,photoPath,duty,promise,business,online,modelIds,createTime,createUserId,updateTime,lastLoginTime,lastLoginAddress,operatorId)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.loginName},#{item.loginPwd},#{item.deptId},#{item.deptName},#{item.windowId},#{item.windowName},#{item.siteId},#{item.siteName},#{item.name},#{item.number},#{item.userpost},#{item.posttitle},#{item.politicalstatus},#{item.dangyuan},#{item.dangyuanext},#{item.idCard},#{item.phone},#{item.mobile},#{item.starlevel},#{item.summary},#{item.photoPath},#{item.duty},#{item.promise},#{item.business},#{item.online},#{item.modelIds},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.lastLoginTime},#{item.lastLoginAddress})
+            (#{item.loginName},#{item.loginPwd},#{item.deptId},#{item.deptName},#{item.windowId},#{item.windowName},#{item.siteId},#{item.siteName},#{item.name},#{item.number},#{item.userpost},#{item.posttitle},#{item.politicalstatus},#{item.dangyuan},#{item.dangyuanext},#{item.idCard},#{item.phone},#{item.mobile},#{item.starlevel},#{item.summary},#{item.photoPath},#{item.duty},#{item.promise},#{item.business},#{item.online},#{item.modelIds},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.lastLoginTime},#{item.lastLoginAddress},#{item.operatorId})
         </foreach>
     </insert>
 
@@ -283,6 +287,9 @@
             <if test="(colPickMode==0 and data.containsKey('lastLoginAddress')) or (colPickMode==1 and !data.containsKey('lastLoginAddress'))">
                 a.lastLoginAddress=#{data.lastLoginAddress},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('operatorId')) or (colPickMode==1 and !data.containsKey('operatorId'))">
+                a.operatorId=#{data.operatorId},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -552,6 +559,13 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="operatorId=(case" suffix="ELSE operatorId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('operatorId')) or (colPickMode==1 and !item.containsKey('operatorId'))">
+                        when a.id=#{item.id} then #{item.operatorId}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -676,12 +690,18 @@
                 ${_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') and conditionParamRef.idNotList.size() > 0">
+            ${_conditionType_} a.id not in
+            <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
             ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
         </if>
@@ -698,12 +718,18 @@
                 ${_conditionType_} a.loginName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('loginNameList')">
+        <if test="conditionParamRef.containsKey('loginNameList') and conditionParamRef.loginNameList.size() > 0">
             ${_conditionType_} a.loginName in
             <foreach collection="conditionParamRef.loginNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('loginNameNotList') and conditionParamRef.loginNameNotList.size() > 0">
+            ${_conditionType_} a.loginName not in
+            <foreach collection="conditionParamRef.loginNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('loginPwd')">
             <if test="conditionParamRef.loginPwd != null and conditionParamRef.loginPwd != ''">
@@ -713,12 +739,18 @@
                 ${_conditionType_} a.loginPwd is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('loginPwdList')">
+        <if test="conditionParamRef.containsKey('loginPwdList') and conditionParamRef.loginPwdList.size() > 0">
             ${_conditionType_} a.loginPwd in
             <foreach collection="conditionParamRef.loginPwdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('loginPwdNotList') and conditionParamRef.loginPwdNotList.size() > 0">
+            ${_conditionType_} a.loginPwd not in
+            <foreach collection="conditionParamRef.loginPwdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('deptId')">
             <if test="conditionParamRef.deptId != null ">
                 ${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
@@ -727,12 +759,18 @@
                 ${_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') and conditionParamRef.deptIdNotList.size() > 0">
+            ${_conditionType_} a.deptId not in
+            <foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('deptIdStart') and conditionParamRef.deptIdStart != null">
             ${_conditionType_} a.deptId <![CDATA[ >= ]]> #{${_conditionParam_}.deptIdStart}
         </if>
@@ -749,12 +787,18 @@
                 ${_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') and conditionParamRef.deptNameNotList.size() > 0">
+            ${_conditionType_} a.deptName not in
+            <foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('windowId')">
             <if test="conditionParamRef.windowId != null ">
                 ${_conditionType_} a.windowId = #{${_conditionParam_}.windowId}
@@ -763,12 +807,18 @@
                 ${_conditionType_} a.windowId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('windowIdList')">
+        <if test="conditionParamRef.containsKey('windowIdList') and conditionParamRef.windowIdList.size() > 0">
             ${_conditionType_} a.windowId in
             <foreach collection="conditionParamRef.windowIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('windowIdNotList') and conditionParamRef.windowIdNotList.size() > 0">
+            ${_conditionType_} a.windowId not in
+            <foreach collection="conditionParamRef.windowIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('windowIdStart') and conditionParamRef.windowIdStart != null">
             ${_conditionType_} a.windowId <![CDATA[ >= ]]> #{${_conditionParam_}.windowIdStart}
         </if>
@@ -785,12 +835,18 @@
                 ${_conditionType_} a.windowName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('windowNameList')">
+        <if test="conditionParamRef.containsKey('windowNameList') and conditionParamRef.windowNameList.size() > 0">
             ${_conditionType_} a.windowName in
             <foreach collection="conditionParamRef.windowNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('windowNameNotList') and conditionParamRef.windowNameNotList.size() > 0">
+            ${_conditionType_} a.windowName not in
+            <foreach collection="conditionParamRef.windowNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('siteId')">
             <if test="conditionParamRef.siteId != null ">
                 ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
@@ -799,12 +855,18 @@
                 ${_conditionType_} a.siteId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('siteIdList')">
+        <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
             ${_conditionType_} a.siteId in
             <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
+            ${_conditionType_} a.siteId not in
+            <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
             ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
         </if>
@@ -821,12 +883,18 @@
                 ${_conditionType_} a.siteName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('siteNameList')">
+        <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
             ${_conditionType_} a.siteName in
             <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
+            ${_conditionType_} a.siteName not in
+            <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('name')">
             <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
@@ -836,12 +904,18 @@
                 ${_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') and conditionParamRef.nameNotList.size() > 0">
+            ${_conditionType_} a.name not in
+            <foreach collection="conditionParamRef.nameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('number')">
             <if test="conditionParamRef.number != null and conditionParamRef.number != ''">
@@ -851,12 +925,18 @@
                 ${_conditionType_} a.number is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('numberList')">
+        <if test="conditionParamRef.containsKey('numberList') and conditionParamRef.numberList.size() > 0">
             ${_conditionType_} a.number in
             <foreach collection="conditionParamRef.numberList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('numberNotList') and conditionParamRef.numberNotList.size() > 0">
+            ${_conditionType_} a.number not in
+            <foreach collection="conditionParamRef.numberNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('userpost')">
             <if test="conditionParamRef.userpost != null and conditionParamRef.userpost != ''">
@@ -866,12 +946,18 @@
                 ${_conditionType_} a.userpost is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('userpostList')">
+        <if test="conditionParamRef.containsKey('userpostList') and conditionParamRef.userpostList.size() > 0">
             ${_conditionType_} a.userpost in
             <foreach collection="conditionParamRef.userpostList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('userpostNotList') and conditionParamRef.userpostNotList.size() > 0">
+            ${_conditionType_} a.userpost not in
+            <foreach collection="conditionParamRef.userpostNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('posttitle')">
             <if test="conditionParamRef.posttitle != null and conditionParamRef.posttitle != ''">
@@ -881,12 +967,18 @@
                 ${_conditionType_} a.posttitle is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('posttitleList')">
+        <if test="conditionParamRef.containsKey('posttitleList') and conditionParamRef.posttitleList.size() > 0">
             ${_conditionType_} a.posttitle in
             <foreach collection="conditionParamRef.posttitleList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('posttitleNotList') and conditionParamRef.posttitleNotList.size() > 0">
+            ${_conditionType_} a.posttitle not in
+            <foreach collection="conditionParamRef.posttitleNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('politicalstatus')">
             <if test="conditionParamRef.politicalstatus != null ">
                 ${_conditionType_} a.politicalstatus = #{${_conditionParam_}.politicalstatus}
@@ -895,12 +987,18 @@
                 ${_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') and conditionParamRef.politicalstatusNotList.size() > 0">
+            ${_conditionType_} a.politicalstatus not in
+            <foreach collection="conditionParamRef.politicalstatusNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('politicalstatusStart') and conditionParamRef.politicalstatusStart != null">
             ${_conditionType_} a.politicalstatus <![CDATA[ >= ]]> #{${_conditionParam_}.politicalstatusStart}
         </if>
@@ -916,12 +1014,18 @@
                 ${_conditionType_} a.dangyuan is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('dangyuanList')">
+        <if test="conditionParamRef.containsKey('dangyuanList') and conditionParamRef.dangyuanList.size() > 0">
             ${_conditionType_} a.dangyuan in
             <foreach collection="conditionParamRef.dangyuanList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('dangyuanNotList') and conditionParamRef.dangyuanNotList.size() > 0">
+            ${_conditionType_} a.dangyuan not in
+            <foreach collection="conditionParamRef.dangyuanNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('dangyuanStart') and conditionParamRef.dangyuanStart != null">
             ${_conditionType_} a.dangyuan <![CDATA[ >= ]]> #{${_conditionParam_}.dangyuanStart}
         </if>
@@ -938,12 +1042,18 @@
                 ${_conditionType_} a.dangyuanext is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('dangyuanextList')">
+        <if test="conditionParamRef.containsKey('dangyuanextList') and conditionParamRef.dangyuanextList.size() > 0">
             ${_conditionType_} a.dangyuanext in
             <foreach collection="conditionParamRef.dangyuanextList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('dangyuanextNotList') and conditionParamRef.dangyuanextNotList.size() > 0">
+            ${_conditionType_} a.dangyuanext not in
+            <foreach collection="conditionParamRef.dangyuanextNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('idCard')">
             <if test="conditionParamRef.idCard != null and conditionParamRef.idCard != ''">
@@ -953,12 +1063,18 @@
                 ${_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') and conditionParamRef.idCardNotList.size() > 0">
+            ${_conditionType_} a.idCard not in
+            <foreach collection="conditionParamRef.idCardNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('phone')">
             <if test="conditionParamRef.phone != null and conditionParamRef.phone != ''">
@@ -968,12 +1084,18 @@
                 ${_conditionType_} a.phone is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('phoneList')">
+        <if test="conditionParamRef.containsKey('phoneList') and conditionParamRef.phoneList.size() > 0">
             ${_conditionType_} a.phone in
             <foreach collection="conditionParamRef.phoneList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('phoneNotList') and conditionParamRef.phoneNotList.size() > 0">
+            ${_conditionType_} a.phone not in
+            <foreach collection="conditionParamRef.phoneNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('mobile')">
             <if test="conditionParamRef.mobile != null and conditionParamRef.mobile != ''">
@@ -983,12 +1105,18 @@
                 ${_conditionType_} a.mobile is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('mobileList')">
+        <if test="conditionParamRef.containsKey('mobileList') and conditionParamRef.mobileList.size() > 0">
             ${_conditionType_} a.mobile in
             <foreach collection="conditionParamRef.mobileList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('mobileNotList') and conditionParamRef.mobileNotList.size() > 0">
+            ${_conditionType_} a.mobile not in
+            <foreach collection="conditionParamRef.mobileNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('starlevel')">
             <if test="conditionParamRef.starlevel != null ">
                 ${_conditionType_} a.starlevel = #{${_conditionParam_}.starlevel}
@@ -997,12 +1125,18 @@
                 ${_conditionType_} a.starlevel is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('starlevelList')">
+        <if test="conditionParamRef.containsKey('starlevelList') and conditionParamRef.starlevelList.size() > 0">
             ${_conditionType_} a.starlevel in
             <foreach collection="conditionParamRef.starlevelList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('starlevelNotList') and conditionParamRef.starlevelNotList.size() > 0">
+            ${_conditionType_} a.starlevel not in
+            <foreach collection="conditionParamRef.starlevelNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('starlevelStart') and conditionParamRef.starlevelStart != null">
             ${_conditionType_} a.starlevel <![CDATA[ >= ]]> #{${_conditionParam_}.starlevelStart}
         </if>
@@ -1019,12 +1153,18 @@
                 ${_conditionType_} a.summary is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('summaryList')">
+        <if test="conditionParamRef.containsKey('summaryList') and conditionParamRef.summaryList.size() > 0">
             ${_conditionType_} a.summary in
             <foreach collection="conditionParamRef.summaryList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('summaryNotList') and conditionParamRef.summaryNotList.size() > 0">
+            ${_conditionType_} a.summary not in
+            <foreach collection="conditionParamRef.summaryNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('photoPath')">
             <if test="conditionParamRef.photoPath != null and conditionParamRef.photoPath != ''">
@@ -1034,12 +1174,18 @@
                 ${_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') and conditionParamRef.photoPathNotList.size() > 0">
+            ${_conditionType_} a.photoPath not in
+            <foreach collection="conditionParamRef.photoPathNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('duty')">
             <if test="conditionParamRef.duty != null and conditionParamRef.duty != ''">
@@ -1049,12 +1195,18 @@
                 ${_conditionType_} a.duty is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('dutyList')">
+        <if test="conditionParamRef.containsKey('dutyList') and conditionParamRef.dutyList.size() > 0">
             ${_conditionType_} a.duty in
             <foreach collection="conditionParamRef.dutyList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('dutyNotList') and conditionParamRef.dutyNotList.size() > 0">
+            ${_conditionType_} a.duty not in
+            <foreach collection="conditionParamRef.dutyNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('promise')">
             <if test="conditionParamRef.promise != null and conditionParamRef.promise != ''">
@@ -1064,12 +1216,18 @@
                 ${_conditionType_} a.promise is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('promiseList')">
+        <if test="conditionParamRef.containsKey('promiseList') and conditionParamRef.promiseList.size() > 0">
             ${_conditionType_} a.promise in
             <foreach collection="conditionParamRef.promiseList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('promiseNotList') and conditionParamRef.promiseNotList.size() > 0">
+            ${_conditionType_} a.promise not in
+            <foreach collection="conditionParamRef.promiseNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('business')">
             <if test="conditionParamRef.business != null and conditionParamRef.business != ''">
@@ -1079,12 +1237,18 @@
                 ${_conditionType_} a.business is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('businessList')">
+        <if test="conditionParamRef.containsKey('businessList') and conditionParamRef.businessList.size() > 0">
             ${_conditionType_} a.business in
             <foreach collection="conditionParamRef.businessList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('businessNotList') and conditionParamRef.businessNotList.size() > 0">
+            ${_conditionType_} a.business not in
+            <foreach collection="conditionParamRef.businessNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('online')">
             <if test="conditionParamRef.online != null ">
                 ${_conditionType_} a.online = #{${_conditionParam_}.online}
@@ -1093,12 +1257,18 @@
                 ${_conditionType_} a.online is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('onlineList')">
+        <if test="conditionParamRef.containsKey('onlineList') and conditionParamRef.onlineList.size() > 0">
             ${_conditionType_} a.online in
             <foreach collection="conditionParamRef.onlineList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('onlineNotList') and conditionParamRef.onlineNotList.size() > 0">
+            ${_conditionType_} a.online not in
+            <foreach collection="conditionParamRef.onlineNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('onlineStart') and conditionParamRef.onlineStart != null">
             ${_conditionType_} a.online <![CDATA[ >= ]]> #{${_conditionParam_}.onlineStart}
         </if>
@@ -1115,12 +1285,18 @@
                 ${_conditionType_} a.modelIds is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('modelIdsList')">
+        <if test="conditionParamRef.containsKey('modelIdsList') and conditionParamRef.modelIdsList.size() > 0">
             ${_conditionType_} a.modelIds in
             <foreach collection="conditionParamRef.modelIdsList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('modelIdsNotList') and conditionParamRef.modelIdsNotList.size() > 0">
+            ${_conditionType_} a.modelIds not in
+            <foreach collection="conditionParamRef.modelIdsNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('createTime')">
             <if test="conditionParamRef.createTime != null ">
@@ -1144,12 +1320,18 @@
                 ${_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') and conditionParamRef.createUserIdNotList.size() > 0">
+            ${_conditionType_} a.createUserId not in
+            <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
             ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
         </if>
@@ -1196,12 +1378,39 @@
                 ${_conditionType_} a.lastLoginAddress is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('lastLoginAddressList')">
+        <if test="conditionParamRef.containsKey('lastLoginAddressList') and conditionParamRef.lastLoginAddressList.size() > 0">
             ${_conditionType_} a.lastLoginAddress in
             <foreach collection="conditionParamRef.lastLoginAddressList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('lastLoginAddressNotList') and conditionParamRef.lastLoginAddressNotList.size() > 0">
+            ${_conditionType_} a.lastLoginAddress not in
+            <foreach collection="conditionParamRef.lastLoginAddressNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('operatorId')">
+            <if test="conditionParamRef.operatorId != null and conditionParamRef.operatorId != ''">
+                ${_conditionType_} a.operatorId like #{${_conditionParam_}.operatorId}
+            </if>
+            <if test="conditionParamRef.operatorId == null">
+                ${_conditionType_} a.operatorId is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('operatorIdList') and conditionParamRef.operatorIdList.size() > 0">
+            ${_conditionType_} a.operatorId in
+            <foreach collection="conditionParamRef.operatorIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('operatorIdNotList') and conditionParamRef.operatorIdNotList.size() > 0">
+            ${_conditionType_} a.operatorId not in
+            <foreach collection="conditionParamRef.operatorIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1375,6 +1584,11 @@
                     <if test='orderCol.lastLoginAddress != null and "DESC".equalsIgnoreCase(orderCol.lastLoginAddress)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('operatorId')">
+                    a.operatorId
+                    <if test='orderCol.operatorId != null and "DESC".equalsIgnoreCase(orderCol.operatorId)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>

base-manager/src/test/java/com/mortals/httpclient/area/AreaController.http

@@ -54,5 +54,10 @@ GET {{baseUrl}}/area/getListByRootId?rootId=0
 Accept: application/json
 
 
+###区域查看
+GET {{baseUrl}}/area/getListByParentId?parentId=8fc9422b1bca40fa86f12b028b33e6cf
+Accept: application/json
+
+