添加更新基础区域

agent-manager/src/main/java/com/mortals/xhx/module/base/model/BaseAreaEntity.java

 package com.mortals.xhx.module.base.model;
-
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.base.model.vo.BaseAreaVo;
+import lombok.Data;
 /**
-* 区域实体对象
-*
-* @author zxfei
-* @date 2022-11-22
-*/
-
+ * 区域实体对象
+ *
+ * @author zxfei
+ * @date 2025-05-13
+ */
+@Data
 public class BaseAreaEntity extends BaseAreaVo {
     private static final long serialVersionUID = 1L;
 
@@ -63,196 +71,6 @@ public class BaseAreaEntity extends BaseAreaVo {
      * 区域状态 (0.停用，1.正常)
      */
     private Integer status;
-
-
-
-    public BaseAreaEntity(){}
-    /**
-    * 获取 祖级列表，逗号分隔
-    * @return String
-    */
-    public String getAncestors(){
-        return ancestors;
-    }
-    /**
-    * 设置 祖级列表，逗号分隔
-    * @param ancestors
-    */
-    public void setAncestors(String ancestors){
-        this.ancestors = ancestors;
-    }
-    /**
-    * 获取 区域名称
-    * @return String
-    */
-    public String getName(){
-        return name;
-    }
-    /**
-    * 设置 区域名称
-    * @param name
-    */
-    public void setName(String name){
-        this.name = name;
-    }
-    /**
-    * 获取 一体化的ID号
-    * @return String
-    */
-    public String getIid(){
-        return iid;
-    }
-    /**
-    * 设置 一体化的ID号
-    * @param iid
-    */
-    public void setIid(String iid){
-        this.iid = iid;
-    }
-    /**
-    * 获取 一体化的父id
-    * @return String
-    */
-    public String getPid(){
-        return pid;
-    }
-    /**
-    * 设置 一体化的父id
-    * @param pid
-    */
-    public void setPid(String pid){
-        this.pid = pid;
-    }
-    /**
-    * 获取 是否有下级区域（True.是，False.否）
-    * @return String
-    */
-    public String getHaveSonArea(){
-        return haveSonArea;
-    }
-    /**
-    * 设置 是否有下级区域（True.是，False.否）
-    * @param haveSonArea
-    */
-    public void setHaveSonArea(String haveSonArea){
-        this.haveSonArea = haveSonArea;
-    }
-    /**
-    * 获取 是否有下级部门（True.是，False.否）
-    * @return String
-    */
-    public String getHaveSonDept(){
-        return haveSonDept;
-    }
-    /**
-    * 设置 是否有下级部门（True.是，False.否）
-    * @param haveSonDept
-    */
-    public void setHaveSonDept(String haveSonDept){
-        this.haveSonDept = haveSonDept;
-    }
-    /**
-    * 获取 是否获取部门（true.是，false.否）
-    * @return String
-    */
-    public String getHaveGetDept(){
-        return haveGetDept;
-    }
-    /**
-    * 设置 是否获取部门（true.是，false.否）
-    * @param haveGetDept
-    */
-    public void setHaveGetDept(String haveGetDept){
-        this.haveGetDept = haveGetDept;
-    }
-    /**
-    * 获取 是否获取事项列表（true.是，false.否）
-    * @return String
-    */
-    public String getHaveGetMatterList(){
-        return haveGetMatterList;
-    }
-    /**
-    * 设置 是否获取事项列表（true.是，false.否）
-    * @param haveGetMatterList
-    */
-    public void setHaveGetMatterList(String haveGetMatterList){
-        this.haveGetMatterList = haveGetMatterList;
-    }
-    /**
-    * 获取 区域编码
-    * @return String
-    */
-    public String getAreaCode(){
-        return areaCode;
-    }
-    /**
-    * 设置 区域编码
-    * @param areaCode
-    */
-    public void setAreaCode(String areaCode){
-        this.areaCode = areaCode;
-    }
-    /**
-    * 获取 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
-    * @return Integer
-    */
-    public Integer getAreaLevel(){
-        return areaLevel;
-    }
-    /**
-    * 设置 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
-    * @param areaLevel
-    */
-    public void setAreaLevel(Integer areaLevel){
-        this.areaLevel = areaLevel;
-    }
-    /**
-    * 获取 名称简称
-    * @return String
-    */
-    public String getShortName(){
-        return shortName;
-    }
-    /**
-    * 设置 名称简称
-    * @param shortName
-    */
-    public void setShortName(String shortName){
-        this.shortName = shortName;
-    }
-    /**
-    * 获取 访问地址
-    * @return String
-    */
-    public String getDomain(){
-        return domain;
-    }
-    /**
-    * 设置 访问地址
-    * @param domain
-    */
-    public void setDomain(String domain){
-        this.domain = domain;
-    }
-    /**
-    * 获取 区域状态 (0.停用，1.正常)
-    * @return Integer
-    */
-    public Integer getStatus(){
-        return status;
-    }
-    /**
-    * 设置 区域状态 (0.停用，1.正常)
-    * @param status
-    */
-    public void setStatus(Integer status){
-        this.status = status;
-    }
-
-
-
-
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -269,50 +87,19 @@ public class BaseAreaEntity extends BaseAreaVo {
         return false;
     }
 
-    public String toString(){
-        StringBuilder sb = new StringBuilder("");
-        sb.append(",ancestors:").append(getAncestors());
-        sb.append(",name:").append(getName());
-        sb.append(",iid:").append(getIid());
-        sb.append(",pid:").append(getPid());
-        sb.append(",haveSonArea:").append(getHaveSonArea());
-        sb.append(",haveSonDept:").append(getHaveSonDept());
-        sb.append(",haveGetDept:").append(getHaveGetDept());
-        sb.append(",haveGetMatterList:").append(getHaveGetMatterList());
-        sb.append(",areaCode:").append(getAreaCode());
-        sb.append(",areaLevel:").append(getAreaLevel());
-        sb.append(",shortName:").append(getShortName());
-        sb.append(",domain:").append(getDomain());
-        sb.append(",status:").append(getStatus());
-        return sb.toString();
-    }
-
     public void initAttrValue(){
-
         this.ancestors = "";
-
         this.name = "";
-
         this.iid = "";
-
         this.pid = "";
-
         this.haveSonArea = "";
-
         this.haveSonDept = "";
-
         this.haveGetDept = "";
-
         this.haveGetMatterList = "";
-
         this.areaCode = "";
-
         this.areaLevel = 1;
-
         this.shortName = "";
-
         this.domain = "";
-
         this.status = 1;
     }
 }
\ No newline at end of file

agent-manager/src/main/java/com/mortals/xhx/module/base/model/BaseAreaQuery.java

 package com.mortals.xhx.module.base.model;
 
 import java.util.List;
-
+import com.mortals.xhx.module.base.model.BaseAreaEntity;
 /**
-* 区域查询对象
-*
-* @author zxfei
-* @date 2022-11-22
-*/
+ * 区域查询对象
+ *
+ * @author zxfei
+ * @date 2025-05-13
+ */
 public class BaseAreaQuery extends BaseAreaEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -21,33 +21,54 @@ public class BaseAreaQuery extends BaseAreaEntity {
     /** 序号，主键，自增长列表 */
     private List <Long> idList;
 
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
     /** 祖级列表，逗号分隔 */
     private List<String> ancestorsList;
 
+    /** 祖级列表，逗号分隔排除列表 */
+    private List <String> ancestorsNotList;
     /** 区域名称 */
     private List<String> nameList;
 
+    /** 区域名称排除列表 */
+    private List <String> nameNotList;
     /** 一体化的ID号 */
     private List<String> iidList;
 
+    /** 一体化的ID号排除列表 */
+    private List <String> iidNotList;
     /** 一体化的父id */
     private List<String> pidList;
 
+    /** 一体化的父id排除列表 */
+    private List <String> pidNotList;
     /** 是否有下级区域（True.是，False.否） */
     private List<String> haveSonAreaList;
 
+    /** 是否有下级区域（True.是，False.否）排除列表 */
+    private List <String> haveSonAreaNotList;
     /** 是否有下级部门（True.是，False.否） */
     private List<String> haveSonDeptList;
 
+    /** 是否有下级部门（True.是，False.否）排除列表 */
+    private List <String> haveSonDeptNotList;
     /** 是否获取部门（true.是，false.否） */
     private List<String> haveGetDeptList;
 
+    /** 是否获取部门（true.是，false.否）排除列表 */
+    private List <String> haveGetDeptNotList;
     /** 是否获取事项列表（true.是，false.否） */
     private List<String> haveGetMatterListList;
 
+    /** 是否获取事项列表（true.是，false.否）排除列表 */
+    private List <String> haveGetMatterListNotList;
     /** 区域编码 */
     private List<String> areaCodeList;
 
+    /** 区域编码排除列表 */
+    private List <String> areaCodeNotList;
     /** 开始 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区) */
     private Integer areaLevelStart;
 
@@ -60,12 +81,19 @@ public class BaseAreaQuery extends BaseAreaEntity {
     /** 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)列表 */
     private List <Integer> areaLevelList;
 
+    /** 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)排除列表 */
+    private List <Integer> areaLevelNotList;
+
     /** 名称简称 */
     private List<String> shortNameList;
 
+    /** 名称简称排除列表 */
+    private List <String> shortNameNotList;
     /** 访问地址 */
     private List<String> domainList;
 
+    /** 访问地址排除列表 */
+    private List <String> domainNotList;
     /** 开始 区域状态 (0.停用，1.正常) */
     private Integer statusStart;
 
@@ -78,6 +106,9 @@ public class BaseAreaQuery extends BaseAreaEntity {
     /** 区域状态 (0.停用，1.正常)列表 */
     private List <Integer> statusList;
 
+    /** 区域状态 (0.停用，1.正常)排除列表 */
+    private List <Integer> statusNotList;
+
     /** 开始 创建时间 */
     private String createTimeStart;
 
@@ -96,6 +127,9 @@ public class BaseAreaQuery extends BaseAreaEntity {
     /** 创建用户列表 */
     private List <Long> createUserIdList;
 
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
     /** 开始 修改时间 */
     private String updateTimeStart;
 
@@ -174,6 +208,23 @@ public class BaseAreaQuery extends BaseAreaEntity {
         this.idList = idList;
     }
 
+    /**
+     * 获取 序号，主键，自增长
+     * @return idNotList
+     */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
     /**
      * 获取 祖级列表，逗号分隔
      * @return ancestorsList
@@ -189,6 +240,23 @@ public class BaseAreaQuery extends BaseAreaEntity {
     public void setAncestorsList(List<String> ancestorsList){
         this.ancestorsList = ancestorsList;
     }
+
+    /**
+     * 获取 祖级列表，逗号分隔
+     * @return ancestorsNotList
+     */
+    public List<String> getAncestorsNotList(){
+        return this.ancestorsNotList;
+    }
+
+    /**
+     * 设置 祖级列表，逗号分隔
+     * @param ancestorsNotList
+     */
+    public void setAncestorsNotList(List<String> ancestorsNotList){
+        this.ancestorsNotList = ancestorsNotList;
+    }
+
     /**
      * 获取 区域名称
      * @return nameList
@@ -204,6 +272,23 @@ public class BaseAreaQuery extends BaseAreaEntity {
     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;
+    }
+
     /**
      * 获取 一体化的ID号
      * @return iidList
@@ -219,6 +304,23 @@ public class BaseAreaQuery extends BaseAreaEntity {
     public void setIidList(List<String> iidList){
         this.iidList = iidList;
     }
+
+    /**
+     * 获取 一体化的ID号
+     * @return iidNotList
+     */
+    public List<String> getIidNotList(){
+        return this.iidNotList;
+    }
+
+    /**
+     * 设置 一体化的ID号
+     * @param iidNotList
+     */
+    public void setIidNotList(List<String> iidNotList){
+        this.iidNotList = iidNotList;
+    }
+
     /**
      * 获取 一体化的父id
      * @return pidList
@@ -234,6 +336,23 @@ public class BaseAreaQuery extends BaseAreaEntity {
     public void setPidList(List<String> pidList){
         this.pidList = pidList;
     }
+
+    /**
+     * 获取 一体化的父id
+     * @return pidNotList
+     */
+    public List<String> getPidNotList(){
+        return this.pidNotList;
+    }
+
+    /**
+     * 设置 一体化的父id
+     * @param pidNotList
+     */
+    public void setPidNotList(List<String> pidNotList){
+        this.pidNotList = pidNotList;
+    }
+
     /**
      * 获取 是否有下级区域（True.是，False.否）
      * @return haveSonAreaList
@@ -249,6 +368,23 @@ public class BaseAreaQuery extends BaseAreaEntity {
     public void setHaveSonAreaList(List<String> haveSonAreaList){
         this.haveSonAreaList = haveSonAreaList;
     }
+
+    /**
+     * 获取 是否有下级区域（True.是，False.否）
+     * @return haveSonAreaNotList
+     */
+    public List<String> getHaveSonAreaNotList(){
+        return this.haveSonAreaNotList;
+    }
+
+    /**
+     * 设置 是否有下级区域（True.是，False.否）
+     * @param haveSonAreaNotList
+     */
+    public void setHaveSonAreaNotList(List<String> haveSonAreaNotList){
+        this.haveSonAreaNotList = haveSonAreaNotList;
+    }
+
     /**
      * 获取 是否有下级部门（True.是，False.否）
      * @return haveSonDeptList
@@ -264,6 +400,23 @@ public class BaseAreaQuery extends BaseAreaEntity {
     public void setHaveSonDeptList(List<String> haveSonDeptList){
         this.haveSonDeptList = haveSonDeptList;
     }
+
+    /**
+     * 获取 是否有下级部门（True.是，False.否）
+     * @return haveSonDeptNotList
+     */
+    public List<String> getHaveSonDeptNotList(){
+        return this.haveSonDeptNotList;
+    }
+
+    /**
+     * 设置 是否有下级部门（True.是，False.否）
+     * @param haveSonDeptNotList
+     */
+    public void setHaveSonDeptNotList(List<String> haveSonDeptNotList){
+        this.haveSonDeptNotList = haveSonDeptNotList;
+    }
+
     /**
      * 获取 是否获取部门（true.是，false.否）
      * @return haveGetDeptList
@@ -279,6 +432,23 @@ public class BaseAreaQuery extends BaseAreaEntity {
     public void setHaveGetDeptList(List<String> haveGetDeptList){
         this.haveGetDeptList = haveGetDeptList;
     }
+
+    /**
+     * 获取 是否获取部门（true.是，false.否）
+     * @return haveGetDeptNotList
+     */
+    public List<String> getHaveGetDeptNotList(){
+        return this.haveGetDeptNotList;
+    }
+
+    /**
+     * 设置 是否获取部门（true.是，false.否）
+     * @param haveGetDeptNotList
+     */
+    public void setHaveGetDeptNotList(List<String> haveGetDeptNotList){
+        this.haveGetDeptNotList = haveGetDeptNotList;
+    }
+
     /**
      * 获取 是否获取事项列表（true.是，false.否）
      * @return haveGetMatterListList
@@ -294,6 +464,23 @@ public class BaseAreaQuery extends BaseAreaEntity {
     public void setHaveGetMatterListList(List<String> haveGetMatterListList){
         this.haveGetMatterListList = haveGetMatterListList;
     }
+
+    /**
+     * 获取 是否获取事项列表（true.是，false.否）
+     * @return haveGetMatterListNotList
+     */
+    public List<String> getHaveGetMatterListNotList(){
+        return this.haveGetMatterListNotList;
+    }
+
+    /**
+     * 设置 是否获取事项列表（true.是，false.否）
+     * @param haveGetMatterListNotList
+     */
+    public void setHaveGetMatterListNotList(List<String> haveGetMatterListNotList){
+        this.haveGetMatterListNotList = haveGetMatterListNotList;
+    }
+
     /**
      * 获取 区域编码
      * @return areaCodeList
@@ -309,6 +496,23 @@ public class BaseAreaQuery extends BaseAreaEntity {
     public void setAreaCodeList(List<String> areaCodeList){
         this.areaCodeList = areaCodeList;
     }
+
+    /**
+     * 获取 区域编码
+     * @return areaCodeNotList
+     */
+    public List<String> getAreaCodeNotList(){
+        return this.areaCodeNotList;
+    }
+
+    /**
+     * 设置 区域编码
+     * @param areaCodeNotList
+     */
+    public void setAreaCodeNotList(List<String> areaCodeNotList){
+        this.areaCodeNotList = areaCodeNotList;
+    }
+
     /**
      * 获取 开始 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
      * @return areaLevelStart
@@ -373,6 +577,23 @@ public class BaseAreaQuery extends BaseAreaEntity {
         this.areaLevelList = areaLevelList;
     }
 
+    /**
+     * 获取 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
+     * @return areaLevelNotList
+     */
+    public List<Integer> getAreaLevelNotList(){
+        return this.areaLevelNotList;
+    }
+
+    /**
+     * 设置 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
+     * @param areaLevelNotList
+     */
+    public void setAreaLevelNotList(List<Integer> areaLevelNotList){
+        this.areaLevelNotList = areaLevelNotList;
+    }
+
+
     /**
      * 获取 名称简称
      * @return shortNameList
@@ -388,6 +609,23 @@ public class BaseAreaQuery extends BaseAreaEntity {
     public void setShortNameList(List<String> shortNameList){
         this.shortNameList = shortNameList;
     }
+
+    /**
+     * 获取 名称简称
+     * @return shortNameNotList
+     */
+    public List<String> getShortNameNotList(){
+        return this.shortNameNotList;
+    }
+
+    /**
+     * 设置 名称简称
+     * @param shortNameNotList
+     */
+    public void setShortNameNotList(List<String> shortNameNotList){
+        this.shortNameNotList = shortNameNotList;
+    }
+
     /**
      * 获取 访问地址
      * @return domainList
@@ -403,6 +641,23 @@ public class BaseAreaQuery extends BaseAreaEntity {
     public void setDomainList(List<String> domainList){
         this.domainList = domainList;
     }
+
+    /**
+     * 获取 访问地址
+     * @return domainNotList
+     */
+    public List<String> getDomainNotList(){
+        return this.domainNotList;
+    }
+
+    /**
+     * 设置 访问地址
+     * @param domainNotList
+     */
+    public void setDomainNotList(List<String> domainNotList){
+        this.domainNotList = domainNotList;
+    }
+
     /**
      * 获取 开始 区域状态 (0.停用，1.正常)
      * @return statusStart
@@ -467,6 +722,23 @@ public class BaseAreaQuery extends BaseAreaEntity {
         this.statusList = statusList;
     }
 
+    /**
+     * 获取 区域状态 (0.停用，1.正常)
+     * @return statusNotList
+     */
+    public List<Integer> getStatusNotList(){
+        return this.statusNotList;
+    }
+
+    /**
+     * 设置 区域状态 (0.停用，1.正常)
+     * @param statusNotList
+     */
+    public void setStatusNotList(List<Integer> statusNotList){
+        this.statusNotList = statusNotList;
+    }
+
+
     /**
      * 获取 开始 创建时间
      * @return createTimeStart
@@ -563,6 +835,23 @@ public class BaseAreaQuery extends BaseAreaEntity {
         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
@@ -640,6 +929,15 @@ public class BaseAreaQuery extends BaseAreaEntity {
         return this;
     }
 
+    /**
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public BaseAreaQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+    }
+
 
     /**
      * 设置 祖级列表，逗号分隔
@@ -856,6 +1154,15 @@ public class BaseAreaQuery extends BaseAreaEntity {
         return this;
     }
 
+    /**
+     * 设置 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)
+     * @param areaLevelNotList
+     */
+    public BaseAreaQuery areaLevelNotList(List<Integer> areaLevelNotList){
+        this.areaLevelNotList = areaLevelNotList;
+        return this;
+    }
+
 
     /**
      * 设置 名称简称
@@ -939,6 +1246,15 @@ public class BaseAreaQuery extends BaseAreaEntity {
         return this;
     }
 
+    /**
+     * 设置 区域状态 (0.停用，1.正常)
+     * @param statusNotList
+     */
+    public BaseAreaQuery statusNotList(List<Integer> statusNotList){
+        this.statusNotList = statusNotList;
+        return this;
+    }
+
 
     /**
      * 设置  创建用户
@@ -985,6 +1301,15 @@ public class BaseAreaQuery extends BaseAreaEntity {
         return this;
     }
 
+    /**
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
+    public BaseAreaQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+    }
+
 
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)

agent-manager/src/main/resources/sqlmap/module/base/BaseAreaMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.base.dao.ibatis.BaseAreaDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -22,10 +22,8 @@
         <result property="createTime" column="createTime" />
         <result property="createUserId" column="createUserId" />
         <result property="updateTime" column="updateTime" />
-            
     </resultMap>
 
-
     <!-- 表所有列 -->
     <sql id="_columns">
         <trim suffixOverrides="," suffix="">
@@ -66,7 +64,7 @@
                 a.shortName,
             </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('domain') or colPickMode == 1 and data.containsKey('domain')))">
-                    a.`domain`,
+                a.domain,
             </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
                 a.status,
@@ -143,7 +141,7 @@
                 a.shortName=#{data.shortName},
             </if>
             <if test="(colPickMode==0 and data.containsKey('domain')) or (colPickMode==1 and !data.containsKey('domain'))">
-                a.`domain`=#{data.domain},
+                a.domain=#{data.domain},
             </if>
             <if test="(colPickMode==0 and data.containsKey('status')) or (colPickMode==1 and !data.containsKey('status'))">
                 a.status=#{data.status},
@@ -316,7 +314,7 @@
     </select>
     <!-- 根据主健删除 -->
     <delete id="deleteByKey" parameterType="paramDto">
-        delete a.* from mortals_sys_base_area as a where a.id=#{condition.id}
+        delete  from mortals_sys_base_area  where id=#{condition.id}
     </delete>
     <!-- 根据主健删除一批，针对单一主健有效 -->
     <delete id="deleteByKeys">
@@ -413,6 +411,10 @@
     <!-- 条件映射-代参数 -->
     <sql id="_condition_param_">
         <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="permissionSql != null and permissionSql != ''">
+            ${permissionSql}
+        </if>
+
         <if test="conditionParamRef.containsKey('id')">
             <if test="conditionParamRef.id != null">
                 ${_conditionType_} a.id=#{${_conditionParam_}.id}
@@ -426,12 +428,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>
@@ -448,12 +456,18 @@
                 ${_conditionType_} a.ancestors is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('ancestorsList')">
+        <if test="conditionParamRef.containsKey('ancestorsList') and conditionParamRef.ancestorsList.size() > 0">
             ${_conditionType_} a.ancestors in
             <foreach collection="conditionParamRef.ancestorsList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('ancestorsNotList') and conditionParamRef.ancestorsNotList.size() > 0">
+            ${_conditionType_} a.ancestors not in
+            <foreach collection="conditionParamRef.ancestorsNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('name')">
             <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
@@ -463,12 +477,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('iid')">
             <if test="conditionParamRef.iid != null and conditionParamRef.iid != ''">
@@ -478,12 +498,18 @@
                 ${_conditionType_} a.iid is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('iidList')">
+        <if test="conditionParamRef.containsKey('iidList') and conditionParamRef.iidList.size() > 0">
             ${_conditionType_} a.iid in
             <foreach collection="conditionParamRef.iidList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('iidNotList') and conditionParamRef.iidNotList.size() > 0">
+            ${_conditionType_} a.iid not in
+            <foreach collection="conditionParamRef.iidNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('pid')">
             <if test="conditionParamRef.pid != null and conditionParamRef.pid != ''">
@@ -493,12 +519,18 @@
                 ${_conditionType_} a.pid is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('pidList')">
+        <if test="conditionParamRef.containsKey('pidList') and conditionParamRef.pidList.size() > 0">
             ${_conditionType_} a.pid in
             <foreach collection="conditionParamRef.pidList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('pidNotList') and conditionParamRef.pidNotList.size() > 0">
+            ${_conditionType_} a.pid not in
+            <foreach collection="conditionParamRef.pidNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('haveSonArea')">
             <if test="conditionParamRef.haveSonArea != null and conditionParamRef.haveSonArea != ''">
@@ -508,12 +540,18 @@
                 ${_conditionType_} a.haveSonArea is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('haveSonAreaList')">
+        <if test="conditionParamRef.containsKey('haveSonAreaList') and conditionParamRef.haveSonAreaList.size() > 0">
             ${_conditionType_} a.haveSonArea in
             <foreach collection="conditionParamRef.haveSonAreaList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('haveSonAreaNotList') and conditionParamRef.haveSonAreaNotList.size() > 0">
+            ${_conditionType_} a.haveSonArea not in
+            <foreach collection="conditionParamRef.haveSonAreaNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('haveSonDept')">
             <if test="conditionParamRef.haveSonDept != null and conditionParamRef.haveSonDept != ''">
@@ -523,12 +561,18 @@
                 ${_conditionType_} a.haveSonDept is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('haveSonDeptList')">
+        <if test="conditionParamRef.containsKey('haveSonDeptList') and conditionParamRef.haveSonDeptList.size() > 0">
             ${_conditionType_} a.haveSonDept in
             <foreach collection="conditionParamRef.haveSonDeptList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('haveSonDeptNotList') and conditionParamRef.haveSonDeptNotList.size() > 0">
+            ${_conditionType_} a.haveSonDept not in
+            <foreach collection="conditionParamRef.haveSonDeptNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('haveGetDept')">
             <if test="conditionParamRef.haveGetDept != null and conditionParamRef.haveGetDept != ''">
@@ -538,12 +582,18 @@
                 ${_conditionType_} a.haveGetDept is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('haveGetDeptList')">
+        <if test="conditionParamRef.containsKey('haveGetDeptList') and conditionParamRef.haveGetDeptList.size() > 0">
             ${_conditionType_} a.haveGetDept in
             <foreach collection="conditionParamRef.haveGetDeptList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('haveGetDeptNotList') and conditionParamRef.haveGetDeptNotList.size() > 0">
+            ${_conditionType_} a.haveGetDept not in
+            <foreach collection="conditionParamRef.haveGetDeptNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('haveGetMatterList')">
             <if test="conditionParamRef.haveGetMatterList != null and conditionParamRef.haveGetMatterList != ''">
@@ -553,12 +603,18 @@
                 ${_conditionType_} a.haveGetMatterList is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('haveGetMatterListList')">
+        <if test="conditionParamRef.containsKey('haveGetMatterListList') and conditionParamRef.haveGetMatterListList.size() > 0">
             ${_conditionType_} a.haveGetMatterList in
             <foreach collection="conditionParamRef.haveGetMatterListList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('haveGetMatterListNotList') and conditionParamRef.haveGetMatterListNotList.size() > 0">
+            ${_conditionType_} a.haveGetMatterList not in
+            <foreach collection="conditionParamRef.haveGetMatterListNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('areaCode')">
             <if test="conditionParamRef.areaCode != null and conditionParamRef.areaCode != ''">
@@ -568,12 +624,18 @@
                 ${_conditionType_} a.areaCode is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('areaCodeList')">
+        <if test="conditionParamRef.containsKey('areaCodeList') and conditionParamRef.areaCodeList.size() > 0">
             ${_conditionType_} a.areaCode in
             <foreach collection="conditionParamRef.areaCodeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('areaCodeNotList') and conditionParamRef.areaCodeNotList.size() > 0">
+            ${_conditionType_} a.areaCode not in
+            <foreach collection="conditionParamRef.areaCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('areaLevel')">
             <if test="conditionParamRef.areaLevel != null ">
                 ${_conditionType_} a.areaLevel = #{${_conditionParam_}.areaLevel}
@@ -582,12 +644,18 @@
                 ${_conditionType_} a.areaLevel is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('areaLevelList')">
+        <if test="conditionParamRef.containsKey('areaLevelList') and conditionParamRef.areaLevelList.size() > 0">
             ${_conditionType_} a.areaLevel in
             <foreach collection="conditionParamRef.areaLevelList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('areaLevelNotList') and conditionParamRef.areaLevelNotList.size() > 0">
+            ${_conditionType_} a.areaLevel not in
+            <foreach collection="conditionParamRef.areaLevelNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('areaLevelStart') and conditionParamRef.areaLevelStart != null">
             ${_conditionType_} a.areaLevel <![CDATA[ >= ]]> #{${_conditionParam_}.areaLevelStart}
         </if>
@@ -604,27 +672,39 @@
                 ${_conditionType_} a.shortName is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('shortNameList')">
+        <if test="conditionParamRef.containsKey('shortNameList') and conditionParamRef.shortNameList.size() > 0">
             ${_conditionType_} a.shortName in
             <foreach collection="conditionParamRef.shortNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('shortNameNotList') and conditionParamRef.shortNameNotList.size() > 0">
+            ${_conditionType_} a.shortName not in
+            <foreach collection="conditionParamRef.shortNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('domain')">
             <if test="conditionParamRef.domain != null and conditionParamRef.domain != ''">
-                    ${_conditionType_} a.`domain` like #{${_conditionParam_}.domain}
+                ${_conditionType_} a.domain like #{${_conditionParam_}.domain}
             </if>
             <if test="conditionParamRef.domain == null">
-                    ${_conditionType_} a.`domain` is null
+                ${_conditionType_} a.domain is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('domainList')">
-                ${_conditionType_} a.`domain` in
+        <if test="conditionParamRef.containsKey('domainList') and conditionParamRef.domainList.size() > 0">
+            ${_conditionType_} a.domain in
             <foreach collection="conditionParamRef.domainList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('domainNotList') and conditionParamRef.domainNotList.size() > 0">
+            ${_conditionType_} a.domain not in
+            <foreach collection="conditionParamRef.domainNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('status')">
             <if test="conditionParamRef.status != null ">
                 ${_conditionType_} a.status = #{${_conditionParam_}.status}
@@ -633,12 +713,18 @@
                 ${_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') and conditionParamRef.statusNotList.size() > 0">
+            ${_conditionType_} a.status not in
+            <foreach collection="conditionParamRef.statusNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null">
             ${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart}
         </if>
@@ -669,12 +755,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>
@@ -701,14 +793,71 @@
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
             order by
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                field(a.id,
+                <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('areaLevelList') and conditionParamRef.areaLevelList.size() > 0">
+                field(a.areaLevel,
+                <foreach collection="conditionParamRef.areaLevelList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('statusList') and conditionParamRef.statusList.size() > 0">
+                field(a.status,
+                <foreach collection="conditionParamRef.statusList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                field(a.createUserId,
+                <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                     ${item.colName} ${item.sortKind}
+                    a.${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
+
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                field(a.id,
+                <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('areaLevelList') and conditionParamRef.areaLevelList.size() > 0">
+                field(a.areaLevel,
+                <foreach collection="conditionParamRef.areaLevelList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('statusList') and conditionParamRef.statusList.size() > 0">
+                field(a.status,
+                <foreach collection="conditionParamRef.statusList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                field(a.createUserId,
+                <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <if test="orderCol.containsKey('id')">
                     a.id
@@ -771,7 +920,7 @@
                     ,
                 </if>
                 <if test="orderCol.containsKey('domain')">
-                        a.`domain`
+                    a.domain
                     <if test='orderCol.domain != null and "DESC".equalsIgnoreCase(orderCol.domain)'>DESC</if>
                     ,
                 </if>
@@ -797,6 +946,8 @@
                 </if>
             </trim>
         </if>
+
+
     </sql>
     <sql id="_group_by_">
         <if test="groupList != null and !groupList.isEmpty()">