diff --git a/base-manager/src/main/java/com/mortals/xhx/ManagerBaseApplication.java b/base-manager/src/main/java/com/mortals/xhx/ManagerBaseApplication.java
index 8c9d2008927fb7349c47423f64acfc0ed450e6b7..69bee9db1ba8ccf64c6037230b59269ccbd690f9 100644
--- a/base-manager/src/main/java/com/mortals/xhx/ManagerBaseApplication.java
+++ b/base-manager/src/main/java/com/mortals/xhx/ManagerBaseApplication.java
@@ -1,6 +1,7 @@
 package com.mortals.xhx;
 
 import com.mortals.framework.springcloud.boot.BaseWebApplication;
+import com.mortals.framework.util.HttpUtil;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
diff --git a/base-manager/src/main/java/com/mortals/xhx/busiz/web/DemoWebApiController.java b/base-manager/src/main/java/com/mortals/xhx/busiz/web/DemoWebApiController.java
index 02d51cf264f7b85f5e59435e2b9fd669072ed10c..03f50bd2e5234fb1451e245712ee723071a9f3da 100644
--- a/base-manager/src/main/java/com/mortals/xhx/busiz/web/DemoWebApiController.java
+++ b/base-manager/src/main/java/com/mortals/xhx/busiz/web/DemoWebApiController.java
@@ -1,6 +1,8 @@
 package com.mortals.xhx.busiz.web;
 
+import cn.hutool.core.codec.Base64;
 import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
@@ -11,6 +13,14 @@ import com.mortals.xhx.module.matter.model.MatterQuery;
 import com.mortals.xhx.module.matter.model.vo.MatterInfo;
 import com.mortals.xhx.module.matter.service.MatterService;
 import lombok.extern.apachecommons.CommonsLog;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.CookieStore;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -18,8 +28,10 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import static com.mortals.framework.ap.SysConstains.MESSAGE_INFO;
 import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;
@@ -31,13 +43,10 @@ import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;
  * @date: 2022/12/14 9:18
  */
 @RestController
-@CommonsLog
 @RequestMapping("test")
+@Slf4j
 public class DemoWebApiController {
 
-    @Autowired
-    private MatterService matterService;
-
     @PostMapping(value = "testGov")
     @UnAuth
     public Rest<String> testGov(@RequestBody MatterQuery query) {
@@ -45,5 +54,61 @@ public class DemoWebApiController {
         return Rest.ok(resp);
     }
 
+    @PostMapping(value = "testCookie")
+    @UnAuth
+    public Rest<String> testCookie(@RequestBody MatterQuery query) {
+        log.info("娴嬭瘯cookie");
+        HttpClient http = null;
+        CookieStore httpCookieStore = new BasicCookieStore();
+        http = HttpClientBuilder.create().setDefaultCookieStore(httpCookieStore).build();
+
+        /* do stuff */
+        HttpGet httpRequest = new HttpGet(query.getUrl());
+        HttpResponse httpResponse = null;
+        try {
+            httpResponse = http.execute(httpRequest);
+            byte[] data = EntityUtils.toByteArray(httpResponse.getEntity());
+            String encode = Base64.encode(data);
+
+            //String content = EntityUtils.toString(entity, charset);
+            //httpResponse.getEntity()
+            //httpResponse.toString()
+        } catch (Exception e) {
+            log.error("寮傚父", e);
+        }
+        /* check cookies */
+        String cookieStr = Arrays.asList(httpCookieStore.getCookies()).stream().map(item -> JSON.toJSONString(item)).collect(Collectors.joining("|"));
+        log.info("cookies:{}", cookieStr);
+        return Rest.ok(cookieStr);
+    }
+
+
+    public static void main(String[] args) {
+        HttpClient http = null;
+        CookieStore httpCookieStore = new BasicCookieStore();
+        http = HttpClientBuilder.create().setDefaultCookieStore(httpCookieStore).build();
+
+        /* do stuff */
+        HttpGet httpRequest = new HttpGet("http://zxbl.sczwfw.gov.cn/app/account/imageCode");
+        HttpResponse httpResponse = null;
+        try {
+            httpResponse = http.execute(httpRequest);
+            byte[] data = EntityUtils.toByteArray(httpResponse.getEntity());
+            String encode = Base64.encode(data);
+
+            log.info("encode64:{}",encode);
+            // String resp = com.mortals.framework.util.HttpUtil.processMultipartResponse(httpResponse);
+           // log.info("resp:{}", resp);
+            //String content = EntityUtils.toString(entity, charset);
+            //httpResponse.getEntity()
+            //httpResponse.toString()
+        } catch (Exception e) {
+            log.error("寮傚父", e);
+        }
+        /* check cookies */
+        String cookieStr = Arrays.asList(httpCookieStore.getCookies()).stream().map(item -> JSON.toJSONString(item)).collect(Collectors.joining("|"));
+       // log.info("cookies:{}", cookieStr);
+    }
+
 
 }
diff --git a/base-manager/src/main/java/com/mortals/xhx/busiz/web/MicroWebApiController.java b/base-manager/src/main/java/com/mortals/xhx/busiz/web/MicroWebApiController.java
index a60ee5415681954cf3457f866273a2a51efaae5f..889983ad3bd9bc8a5134bd5ffb47c551736a5ed9 100644
--- a/base-manager/src/main/java/com/mortals/xhx/busiz/web/MicroWebApiController.java
+++ b/base-manager/src/main/java/com/mortals/xhx/busiz/web/MicroWebApiController.java
@@ -1,10 +1,13 @@
 package com.mortals.xhx.busiz.web;
 
+import cn.hutool.core.codec.Base64;
+import com.alibaba.fastjson.JSON;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
+import com.mortals.framework.util.HttpUtil;
 import com.mortals.framework.web.BaseJsonBodyController;
 import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.matter.model.MatterQuery;
@@ -12,6 +15,14 @@ import com.mortals.xhx.module.matter.model.vo.MatterInfo;
 import com.mortals.xhx.module.matter.service.MatterService;
 import com.mortals.xhx.module.matters.service.MattersService;
 import lombok.extern.apachecommons.CommonsLog;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.CookieStore;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -20,8 +31,10 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import static com.mortals.framework.ap.SysConstains.MESSAGE_INFO;
 import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;
@@ -33,7 +46,7 @@ import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;
  * @date: 2022/12/14 9:18
  */
 @RestController
-@CommonsLog
+@Slf4j
 @RequestMapping("micro")
 public class MicroWebApiController extends BaseJsonBodyController {
 
@@ -65,7 +78,27 @@ public class MicroWebApiController extends BaseJsonBodyController {
         return ret;
     }
 
+    @PostMapping(value = "getPicAndCookie")
+    @UnAuth
+    public Rest<Map<String,String>> getPicAndCookie(@RequestBody MatterQuery query) {
+        log.info("璇锋眰鏌ヨ鍥剧墖涓巆ookies:{}",JSON.toJSONString(query));
+        HashMap<String, String> resultMap = new HashMap<>();
+        CookieStore httpCookieStore = new BasicCookieStore();
+        HttpClient http = HttpClientBuilder.create().setDefaultCookieStore(httpCookieStore).build();
+        HttpGet httpRequest = new HttpGet(query.getUrl());
+        HttpResponse httpResponse = null;
+        try {
+            httpResponse = http.execute(httpRequest);
+            byte[] data = EntityUtils.toByteArray(httpResponse.getEntity());
+            String encode = Base64.encode(data);
+            resultMap.put("base64img","data:image/jpg;base64,"+encode);
+            resultMap.put("cookieStr",JSON.toJSONString(httpCookieStore.getCookies()));
 
+        } catch (Exception e) {
+            log.error("寮傚父", e);
+        }
+        return Rest.ok(resultMap);
+    }
 
     protected PageInfo buildPageInfo(MatterQuery query) {
         PageInfo pageInfo = new PageInfo();
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterEntity.java b/base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterEntity.java
index f99f4f08d0b3f3f3ac5cf2865ae7b9512d241af6..bb32fde97b1137630ec23663ab9aef21dc281741 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterEntity.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterEntity.java
@@ -1,13 +1,16 @@
 package com.mortals.xhx.module.matter.model;
+
 import java.util.List;
 import java.util.Date;
 import java.util.List;
 import java.util.ArrayList;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.matter.model.vo.MatterVo;
 import com.mortals.xhx.module.matter.model.MatterExtEntity;
+
 /**
  * 鍩虹浜嬮」瀹炰綋瀵硅薄
  *
@@ -322,1067 +325,1369 @@ public class MatterEntity extends MatterVo {
     /**
      * 浜嬮」鎵╁睍淇℃伅
      */
-    private List<MatterExtEntity> matterExtList=new ArrayList<>();;
+    private List<MatterExtEntity> matterExtList = new ArrayList<>();
+    ;
 
 
-    public MatterEntity(){}
+    public MatterEntity() {
+    }
+
     /**
      * 鑾峰彇 绔欑偣ID
+     *
      * @return Long
      */
-    public Long getSiteId(){
+    public Long getSiteId() {
         return siteId;
     }
+
     /**
      * 璁剧疆 绔欑偣ID
+     *
      * @param siteId
      */
-    public void setSiteId(Long siteId){
+    public void setSiteId(Long siteId) {
         this.siteId = siteId;
     }
+
     /**
      * 鑾峰彇 浠庢斂鍔＄郴缁熸潵鐨勪簨椤筰d
+     *
      * @return String
      */
-    public String getTid(){
+    public String getTid() {
         return tid;
     }
+
     /**
      * 璁剧疆 浠庢斂鍔＄郴缁熸潵鐨勪簨椤筰d
+     *
      * @param tid
      */
-    public void setTid(String tid){
+    public void setTid(String tid) {
         this.tid = tid;
     }
+
     /**
      * 鑾峰彇 浠庢斂鍔＄郴缁熸潵鐨勪簨椤筩ode
+     *
      * @return String
      */
-    public String getTcode(){
+    public String getTcode() {
         return tcode;
     }
+
     /**
      * 璁剧疆 浠庢斂鍔＄郴缁熸潵鐨勪簨椤筩ode
+     *
      * @param tcode
      */
-    public void setTcode(String tcode){
+    public void setTcode(String tcode) {
         this.tcode = tcode;
     }
+
     /**
      * 鑾峰彇 浠庢斂鍔＄郴缁熸潵鐨勪簨椤筺ame
+     *
      * @return String
      */
-    public String getTname(){
+    public String getTname() {
         return tname;
     }
+
     /**
      * 璁剧疆 浠庢斂鍔＄郴缁熸潵鐨勪簨椤筺ame
+     *
      * @param tname
      */
-    public void setTname(String tname){
+    public void setTname(String tname) {
         this.tname = tname;
     }
+
     /**
      * 鑾峰彇 浜嬮」鍚嶇О
+     *
      * @return String
      */
-    public String getMatterName(){
+    public String getMatterName() {
         return matterName;
     }
+
     /**
      * 璁剧疆 浜嬮」鍚嶇О
+     *
      * @param matterName
      */
-    public void setMatterName(String matterName){
+    public void setMatterName(String matterName) {
         this.matterName = matterName;
     }
+
     /**
      * 鑾峰彇 鑻辫浜嬮」鍚�
+     *
      * @return String
      */
-    public String getEnglishName(){
+    public String getEnglishName() {
         return englishName;
     }
+
     /**
      * 璁剧疆 鑻辫浜嬮」鍚�
+     *
      * @param englishName
      */
-    public void setEnglishName(String englishName){
+    public void setEnglishName(String englishName) {
         this.englishName = englishName;
     }
+
     /**
      * 鑾峰彇 浜嬮」缂栧彿
+     *
      * @return String
      */
-    public String getMatterNo(){
+    public String getMatterNo() {
         return matterNo;
     }
+
     /**
      * 璁剧疆 浜嬮」缂栧彿
+     *
      * @param matterNo
      */
-    public void setMatterNo(String matterNo){
+    public void setMatterNo(String matterNo) {
         this.matterNo = matterNo;
     }
+
     /**
      * 鑾峰彇 鍖哄煙缂栫爜
+     *
      * @return String
      */
-    public String getAreaCode(){
+    public String getAreaCode() {
         return areaCode;
     }
+
     /**
      * 璁剧疆 鍖哄煙缂栫爜
+     *
      * @param areaCode
      */
-    public void setAreaCode(String areaCode){
+    public void setAreaCode(String areaCode) {
         this.areaCode = areaCode;
     }
+
     /**
      * 鑾峰彇 閮ㄩ棬缂栧彿
+     *
      * @return String
      */
-    public String getDeptCode(){
+    public String getDeptCode() {
         return deptCode;
     }
+
     /**
      * 璁剧疆 閮ㄩ棬缂栧彿
+     *
      * @param deptCode
      */
-    public void setDeptCode(String deptCode){
+    public void setDeptCode(String deptCode) {
         this.deptCode = deptCode;
     }
+
     /**
      * 鑾峰彇 閮ㄩ棬鍚嶇О
+     *
      * @return String
      */
-    public String getDeptName(){
+    public String getDeptName() {
         return deptName;
     }
+
     /**
      * 璁剧疆 閮ㄩ棬鍚嶇О
+     *
      * @param deptName
      */
-    public void setDeptName(String deptName){
+    public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
+
     /**
      * 鑾峰彇 琛屾斂鏉冨姏缂栧彿
+     *
      * @return String
      */
-    public String getPowerCode(){
+    public String getPowerCode() {
         return powerCode;
     }
+
     /**
      * 璁剧疆 琛屾斂鏉冨姏缂栧彿
+     *
      * @param powerCode
      */
-    public void setPowerCode(String powerCode){
+    public void setPowerCode(String powerCode) {
         this.powerCode = powerCode;
     }
+
     /**
      * 鑾峰彇 涓婚缂栧彿
+     *
      * @return String
      */
-    public String getThemeCode(){
+    public String getThemeCode() {
         return themeCode;
     }
+
     /**
      * 璁剧疆 涓婚缂栧彿
+     *
      * @param themeCode
      */
-    public void setThemeCode(String themeCode){
+    public void setThemeCode(String themeCode) {
         this.themeCode = themeCode;
     }
+
     /**
      * 鑾峰彇 鏈嶅姟绫诲瀷缂栧彿
+     *
      * @return String
      */
-    public String getUsertypeCode(){
+    public String getUsertypeCode() {
         return usertypeCode;
     }
+
     /**
      * 璁剧疆 鏈嶅姟绫诲瀷缂栧彿
+     *
      * @param usertypeCode
      */
-    public void setUsertypeCode(String usertypeCode){
+    public void setUsertypeCode(String usertypeCode) {
         this.usertypeCode = usertypeCode;
     }
+
     /**
      * 鑾峰彇 浜嬮」缁勫悕
+     *
      * @return String
      */
-    public String getGroupName(){
+    public String getGroupName() {
         return groupName;
     }
+
     /**
      * 璁剧疆 浜嬮」缁勫悕
+     *
      * @param groupName
      */
-    public void setGroupName(String groupName){
+    public void setGroupName(String groupName) {
         this.groupName = groupName;
     }
+
     /**
      * 鑾峰彇 浜嬮」璇︽儏閾炬帴
+     *
      * @return String
      */
-    public String getUrl(){
+    public String getUrl() {
         return url;
     }
+
     /**
      * 璁剧疆 浜嬮」璇︽儏閾炬帴
+     *
      * @param url
      */
-    public void setUrl(String url){
+    public void setUrl(String url) {
         this.url = url;
     }
+
     /**
      * 鑾峰彇 鏄惁鑾峰彇浜嬮」璇︽儏
+     *
      * @return String
      */
-    public String getHaveGetMatterInfo(){
+    public String getHaveGetMatterInfo() {
         return haveGetMatterInfo;
     }
+
     /**
      * 璁剧疆 鏄惁鑾峰彇浜嬮」璇︽儏
+     *
      * @param haveGetMatterInfo
      */
-    public void setHaveGetMatterInfo(String haveGetMatterInfo){
+    public void setHaveGetMatterInfo(String haveGetMatterInfo) {
         this.haveGetMatterInfo = haveGetMatterInfo;
     }
+
     /**
      * 鑾峰彇 鎵€灞為儴闂�
+     *
      * @return String
      */
-    public String getBelongDept(){
+    public String getBelongDept() {
         return belongDept;
     }
+
     /**
      * 璁剧疆 鎵€灞為儴闂�
+     *
      * @param belongDept
      */
-    public void setBelongDept(String belongDept){
+    public void setBelongDept(String belongDept) {
         this.belongDept = belongDept;
     }
+
     /**
      * 鑾峰彇 鏈嶅姟瀵硅薄 锛堜簨涓氭硶浜�.浜嬩笟娉曚汉锛岀ぞ浼氱粍缁囨硶浜�.绀句細缁勭粐娉曚汉锛岄潪娉曚汉浼佷笟.闈炴硶浜轰紒涓氾紝浼佷笟娉曚汉.浼佷笟娉曚汉锛岃嚜鐒朵汉.鑷劧浜猴紝鍏朵粬缁勭粐.鍏朵粬缁勭粐锛�
+     *
      * @return String
      */
-    public String getAppoveObjectShow(){
+    public String getAppoveObjectShow() {
         return appoveObjectShow;
     }
+
     /**
      * 璁剧疆 鏈嶅姟瀵硅薄 锛堜簨涓氭硶浜�.浜嬩笟娉曚汉锛岀ぞ浼氱粍缁囨硶浜�.绀句細缁勭粐娉曚汉锛岄潪娉曚汉浼佷笟.闈炴硶浜轰紒涓氾紝浼佷笟娉曚汉.浼佷笟娉曚汉锛岃嚜鐒朵汉.鑷劧浜猴紝鍏朵粬缁勭粐.鍏朵粬缁勭粐锛�
+     *
      * @param appoveObjectShow
      */
-    public void setAppoveObjectShow(String appoveObjectShow){
+    public void setAppoveObjectShow(String appoveObjectShow) {
         this.appoveObjectShow = appoveObjectShow;
     }
+
     /**
      * 鑾峰彇 閫氬姙鑼冨洿 锛堟棤.鏃狅紝鍏ㄥ浗.鍏ㄥ浗锛屽叏甯�.鍏ㄥ競锛屽叏鍘�.鍏ㄥ幙锛屽叏闀嘯涔� 琛楅亾].鍏ㄩ晣[涔� 琛楅亾]锛岃法鏉慬绀惧尯].璺ㄦ潙[绀惧尯]锛�
+     *
      * @return String
      */
-    public String getOperatScopeShow(){
+    public String getOperatScopeShow() {
         return operatScopeShow;
     }
+
     /**
      * 璁剧疆 閫氬姙鑼冨洿 锛堟棤.鏃狅紝鍏ㄥ浗.鍏ㄥ浗锛屽叏甯�.鍏ㄥ競锛屽叏鍘�.鍏ㄥ幙锛屽叏闀嘯涔� 琛楅亾].鍏ㄩ晣[涔� 琛楅亾]锛岃法鏉慬绀惧尯].璺ㄦ潙[绀惧尯]锛�
+     *
      * @param operatScopeShow
      */
-    public void setOperatScopeShow(String operatScopeShow){
+    public void setOperatScopeShow(String operatScopeShow) {
         this.operatScopeShow = operatScopeShow;
     }
+
     /**
      * 鑾峰彇 鍔炰欢绫诲瀷锛堢綉缁滃姙浠�.缃戠粶鍔炰欢锛岃鏀垮鎵逛竴鑸欢.琛屾斂瀹℃壒涓€鑸欢锛岀患鍚堢獥鍙ｄ欢.缁煎悎绐楀彛浠讹級
+     *
      * @return String
      */
-    public String getAppoveTimeLimitShow(){
+    public String getAppoveTimeLimitShow() {
         return appoveTimeLimitShow;
     }
+
     /**
      * 璁剧疆 鍔炰欢绫诲瀷锛堢綉缁滃姙浠�.缃戠粶鍔炰欢锛岃鏀垮鎵逛竴鑸欢.琛屾斂瀹℃壒涓€鑸欢锛岀患鍚堢獥鍙ｄ欢.缁煎悎绐楀彛浠讹級
+     *
      * @param appoveTimeLimitShow
      */
-    public void setAppoveTimeLimitShow(String appoveTimeLimitShow){
+    public void setAppoveTimeLimitShow(String appoveTimeLimitShow) {
         this.appoveTimeLimitShow = appoveTimeLimitShow;
     }
+
     /**
      * 鑾峰彇 鍔炵悊褰㈠紡锛堢獥鍙ｅ姙鐞�.绐楀彛鍔炵悊锛岀綉涓婂姙鐞�.缃戜笂鍔炵悊锛�
+     *
      * @return String
      */
-    public String getHandleType(){
+    public String getHandleType() {
         return handleType;
     }
+
     /**
      * 璁剧疆 鍔炵悊褰㈠紡锛堢獥鍙ｅ姙鐞�.绐楀彛鍔炵悊锛岀綉涓婂姙鐞�.缃戜笂鍔炵悊锛�
+     *
      * @param handleType
      */
-    public void setHandleType(String handleType){
+    public void setHandleType(String handleType) {
         this.handleType = handleType;
     }
+
     /**
      * 鑾峰彇 娉曞畾鍔炵粨鏃堕檺
+     *
      * @return String
      */
-    public String getLegalTimeLimitShow(){
+    public String getLegalTimeLimitShow() {
         return legalTimeLimitShow;
     }
+
     /**
      * 璁剧疆 娉曞畾鍔炵粨鏃堕檺
+     *
      * @param legalTimeLimitShow
      */
-    public void setLegalTimeLimitShow(String legalTimeLimitShow){
+    public void setLegalTimeLimitShow(String legalTimeLimitShow) {
         this.legalTimeLimitShow = legalTimeLimitShow;
     }
+
     /**
      * 鑾峰彇 娉曞畾鏃堕檺鍔炵粨璇存槑
+     *
      * @return String
      */
-    public String getLegalEndExplain(){
+    public String getLegalEndExplain() {
         return legalEndExplain;
     }
+
     /**
      * 璁剧疆 娉曞畾鏃堕檺鍔炵粨璇存槑
+     *
      * @param legalEndExplain
      */
-    public void setLegalEndExplain(String legalEndExplain){
+    public void setLegalEndExplain(String legalEndExplain) {
         this.legalEndExplain = legalEndExplain;
     }
+
     /**
      * 鑾峰彇 鎵胯鍔炵粨鏃堕檺
+     *
      * @return String
      */
-    public String getPromiseTimeLimitShow(){
+    public String getPromiseTimeLimitShow() {
         return promiseTimeLimitShow;
     }
+
     /**
      * 璁剧疆 鎵胯鍔炵粨鏃堕檺
+     *
      * @param promiseTimeLimitShow
      */
-    public void setPromiseTimeLimitShow(String promiseTimeLimitShow){
+    public void setPromiseTimeLimitShow(String promiseTimeLimitShow) {
         this.promiseTimeLimitShow = promiseTimeLimitShow;
     }
+
     /**
      * 鑾峰彇 鎵胯鏃堕檺鍔炵粨璇存槑
+     *
      * @return String
      */
-    public String getPromiseEndExplain(){
+    public String getPromiseEndExplain() {
         return promiseEndExplain;
     }
+
     /**
      * 璁剧疆 鎵胯鏃堕檺鍔炵粨璇存槑
+     *
      * @param promiseEndExplain
      */
-    public void setPromiseEndExplain(String promiseEndExplain){
+    public void setPromiseEndExplain(String promiseEndExplain) {
         this.promiseEndExplain = promiseEndExplain;
     }
+
     /**
      * 鑾峰彇 鏄惁鏀惰垂锛堝惁.鍚︼紝鏄�.鏄級
+     *
      * @return String
      */
-    public String getIsChargesShow(){
+    public String getIsChargesShow() {
         return isChargesShow;
     }
+
     /**
      * 璁剧疆 鏄惁鏀惰垂锛堝惁.鍚︼紝鏄�.鏄級
+     *
      * @param isChargesShow
      */
-    public void setIsChargesShow(String isChargesShow){
+    public void setIsChargesShow(String isChargesShow) {
         this.isChargesShow = isChargesShow;
     }
+
     /**
      * 鑾峰彇 璁よ瘉绛夌骇闇€姹傦紙瀹炲悕璁よ瘉.瀹炲悕璁よ瘉锛屽崟娆￠潰绛�.鍗曟闈㈢锛屾瘡娆￠潰绛�.姣忔闈㈢锛�
+     *
      * @return String
      */
-    public String getCertificationLevelsShow(){
+    public String getCertificationLevelsShow() {
         return certificationLevelsShow;
     }
+
     /**
      * 璁剧疆 璁よ瘉绛夌骇闇€姹傦紙瀹炲悕璁よ瘉.瀹炲悕璁よ瘉锛屽崟娆￠潰绛�.鍗曟闈㈢锛屾瘡娆￠潰绛�.姣忔闈㈢锛�
+     *
      * @param certificationLevelsShow
      */
-    public void setCertificationLevelsShow(String certificationLevelsShow){
+    public void setCertificationLevelsShow(String certificationLevelsShow) {
         this.certificationLevelsShow = certificationLevelsShow;
     }
+
     /**
      * 鑾峰彇 璁″垝鐢熸晥鏃ユ湡
+     *
      * @return Date
      */
-    public Date getPlanTakeTime(){
+    public Date getPlanTakeTime() {
         return planTakeTime;
     }
+
     /**
      * 璁剧疆 璁″垝鐢熸晥鏃ユ湡
+     *
      * @param planTakeTime
      */
-    public void setPlanTakeTime(Date planTakeTime){
+    public void setPlanTakeTime(Date planTakeTime) {
         this.planTakeTime = planTakeTime;
     }
+
     /**
      * 鑾峰彇 鎵胯鐢熸晥鏃ユ湡
+     *
      * @return Date
      */
-    public Date getPromiseTakeTime(){
+    public Date getPromiseTakeTime() {
         return promiseTakeTime;
     }
+
     /**
      * 璁剧疆 鎵胯鐢熸晥鏃ユ湡
+     *
      * @param promiseTakeTime
      */
-    public void setPromiseTakeTime(Date promiseTakeTime){
+    public void setPromiseTakeTime(Date promiseTakeTime) {
         this.promiseTakeTime = promiseTakeTime;
     }
+
     /**
      * 鑾峰彇 鐗瑰埆绋嬪簭
+     *
      * @return String
      */
-    public String getSpecialProcedure(){
+    public String getSpecialProcedure() {
         return specialProcedure;
     }
+
     /**
      * 璁剧疆 鐗瑰埆绋嬪簭
+     *
      * @param specialProcedure
      */
-    public void setSpecialProcedure(String specialProcedure){
+    public void setSpecialProcedure(String specialProcedure) {
         this.specialProcedure = specialProcedure;
     }
+
     /**
      * 鑾峰彇 绐楀彛鍒扮幇鍦烘鏁�
+     *
      * @return Integer
      */
-    public Integer getWindowToTheSceneNum(){
+    public Integer getWindowToTheSceneNum() {
         return windowToTheSceneNum;
     }
+
     /**
      * 璁剧疆 绐楀彛鍒扮幇鍦烘鏁�
+     *
      * @param windowToTheSceneNum
      */
-    public void setWindowToTheSceneNum(Integer windowToTheSceneNum){
+    public void setWindowToTheSceneNum(Integer windowToTheSceneNum) {
         this.windowToTheSceneNum = windowToTheSceneNum;
     }
+
     /**
      * 鑾峰彇 鏄惁缃戜笂棰勭害,绐楀彛鍔炵悊閫夛紙鍚�.鍚︼紝鏄�.鏄級
+     *
      * @return String
      */
-    public String getIsOnlineSubscribeShow(){
+    public String getIsOnlineSubscribeShow() {
         return isOnlineSubscribeShow;
     }
+
     /**
      * 璁剧疆 鏄惁缃戜笂棰勭害,绐楀彛鍔炵悊閫夛紙鍚�.鍚︼紝鏄�.鏄級
+     *
      * @param isOnlineSubscribeShow
      */
-    public void setIsOnlineSubscribeShow(String isOnlineSubscribeShow){
+    public void setIsOnlineSubscribeShow(String isOnlineSubscribeShow) {
         this.isOnlineSubscribeShow = isOnlineSubscribeShow;
     }
+
     /**
      * 鑾峰彇 鐗╂祦蹇€�,绐楀彛鍔炵悊閫夛紙鍚�.鍚︼紝鏄�.鏄級
+     *
      * @return String
      */
-    public String getIsExpressTakeShow(){
+    public String getIsExpressTakeShow() {
         return isExpressTakeShow;
     }
+
     /**
      * 璁剧疆 鐗╂祦蹇€�,绐楀彛鍔炵悊閫夛紙鍚�.鍚︼紝鏄�.鏄級
+     *
      * @param isExpressTakeShow
      */
-    public void setIsExpressTakeShow(String isExpressTakeShow){
+    public void setIsExpressTakeShow(String isExpressTakeShow) {
         this.isExpressTakeShow = isExpressTakeShow;
     }
+
     /**
      * 鑾峰彇 鏄惁鏀寔鍏ㄧ渷鑼冨洿灏辫繎鍙栦欢锛堝惁.鍚︼紝鏄�.鏄級
+     *
      * @return String
      */
-    public String getIsProvinceAcquisitionShow(){
+    public String getIsProvinceAcquisitionShow() {
         return isProvinceAcquisitionShow;
     }
+
     /**
      * 璁剧疆 鏄惁鏀寔鍏ㄧ渷鑼冨洿灏辫繎鍙栦欢锛堝惁.鍚︼紝鏄�.鏄級
+     *
      * @param isProvinceAcquisitionShow
      */
-    public void setIsProvinceAcquisitionShow(String isProvinceAcquisitionShow){
+    public void setIsProvinceAcquisitionShow(String isProvinceAcquisitionShow) {
         this.isProvinceAcquisitionShow = isProvinceAcquisitionShow;
     }
+
     /**
      * 鑾峰彇 鏄惁鏀寔鍏ㄧ渷鑼冨洿灏辫繎鍔炵悊锛堝惁.鍚︼紝鏄�.鏄級
+     *
      * @return String
      */
-    public String getIsApplyProvinceShow(){
+    public String getIsApplyProvinceShow() {
         return isApplyProvinceShow;
     }
+
     /**
      * 璁剧疆 鏄惁鏀寔鍏ㄧ渷鑼冨洿灏辫繎鍔炵悊锛堝惁.鍚︼紝鏄�.鏄級
+     *
      * @param isApplyProvinceShow
      */
-    public void setIsApplyProvinceShow(String isApplyProvinceShow){
+    public void setIsApplyProvinceShow(String isApplyProvinceShow) {
         this.isApplyProvinceShow = isApplyProvinceShow;
     }
+
     /**
      * 鑾峰彇 蹇呴』鍒扮幇鍦哄師鍥�
+     *
      * @return String
      */
-    public String getMustSceneExplain(){
+    public String getMustSceneExplain() {
         return mustSceneExplain;
     }
+
     /**
      * 璁剧疆 蹇呴』鍒扮幇鍦哄師鍥�
+     *
      * @param mustSceneExplain
      */
-    public void setMustSceneExplain(String mustSceneExplain){
+    public void setMustSceneExplain(String mustSceneExplain) {
         this.mustSceneExplain = mustSceneExplain;
     }
+
     /**
      * 鑾峰彇 缃戝姙绫诲瀷锛堝師浠堕瀹�.鍘熶欢棰勫锛屽師浠舵牳楠�.鍘熶欢鏍搁獙锛屽叏绋嬬綉鍔�.鍏ㄧ▼缃戝姙锛�
+     *
      * @return String
      */
-    public String getOnlineType(){
+    public String getOnlineType() {
         return onlineType;
     }
+
     /**
      * 璁剧疆 缃戝姙绫诲瀷锛堝師浠堕瀹�.鍘熶欢棰勫锛屽師浠舵牳楠�.鍘熶欢鏍搁獙锛屽叏绋嬬綉鍔�.鍏ㄧ▼缃戝姙锛�
+     *
      * @param onlineType
      */
-    public void setOnlineType(String onlineType){
+    public void setOnlineType(String onlineType) {
         this.onlineType = onlineType;
     }
+
     /**
      * 鑾峰彇 缃戝姙鍒扮幇鍦烘鏁�
+     *
      * @return Integer
      */
-    public Integer getOnlineToTheSceneNum(){
+    public Integer getOnlineToTheSceneNum() {
         return onlineToTheSceneNum;
     }
+
     /**
      * 璁剧疆 缃戝姙鍒扮幇鍦烘鏁�
+     *
      * @param onlineToTheSceneNum
      */
-    public void setOnlineToTheSceneNum(Integer onlineToTheSceneNum){
+    public void setOnlineToTheSceneNum(Integer onlineToTheSceneNum) {
         this.onlineToTheSceneNum = onlineToTheSceneNum;
     }
+
     /**
      * 鑾峰彇 缃戠粶鍔炵悊娣卞害锛堜簰鑱旂綉鍜ㄨ.浜掕仈缃戝挩璇紝浜掕仈缃戞敹浠�.浜掕仈缃戞敹浠讹紝浜掕仈缃戦瀹�.浜掕仈缃戦瀹★紝浜掕仈缃戝彈鐞�.浜掕仈缃戝彈鐞嗭紝浜掕仈缃戝姙鐞�.浜掕仈缃戝姙鐞嗭紝浜掕仈缃戝姙鐞嗙粨鏋滀俊鎭弽棣�.浜掕仈缃戝姙鐞嗙粨鏋滀俊鎭弽棣堬紝鍏朵粬.鍏朵粬锛�
+     *
      * @return String
      */
-    public String getOnlineOperatDeep(){
+    public String getOnlineOperatDeep() {
         return onlineOperatDeep;
     }
+
     /**
      * 璁剧疆 缃戠粶鍔炵悊娣卞害锛堜簰鑱旂綉鍜ㄨ.浜掕仈缃戝挩璇紝浜掕仈缃戞敹浠�.浜掕仈缃戞敹浠讹紝浜掕仈缃戦瀹�.浜掕仈缃戦瀹★紝浜掕仈缃戝彈鐞�.浜掕仈缃戝彈鐞嗭紝浜掕仈缃戝姙鐞�.浜掕仈缃戝姙鐞嗭紝浜掕仈缃戝姙鐞嗙粨鏋滀俊鎭弽棣�.浜掕仈缃戝姙鐞嗙粨鏋滀俊鎭弽棣堬紝鍏朵粬.鍏朵粬锛�
+     *
      * @param onlineOperatDeep
      */
-    public void setOnlineOperatDeep(String onlineOperatDeep){
+    public void setOnlineOperatDeep(String onlineOperatDeep) {
         this.onlineOperatDeep = onlineOperatDeep;
     }
+
     /**
      * 鑾峰彇 鐗╂祦蹇€掞紝缃戜笂鍔炵悊閫夛紙鍚�.鍚︼紝鏄�.鏄級
+     *
      * @return String
      */
-    public String getIsExpressTakeOnlineShow(){
+    public String getIsExpressTakeOnlineShow() {
         return isExpressTakeOnlineShow;
     }
+
     /**
      * 璁剧疆 鐗╂祦蹇€掞紝缃戜笂鍔炵悊閫夛紙鍚�.鍚︼紝鏄�.鏄級
+     *
      * @param isExpressTakeOnlineShow
      */
-    public void setIsExpressTakeOnlineShow(String isExpressTakeOnlineShow){
+    public void setIsExpressTakeOnlineShow(String isExpressTakeOnlineShow) {
         this.isExpressTakeOnlineShow = isExpressTakeOnlineShow;
     }
+
     /**
      * 鑾峰彇 鏄惁鏀寔涓婇棬鏀跺彇鐢宠锛堝惁.鍚︼紝鏄�.鏄級
+     *
      * @return String
      */
-    public String getIsDoorTakeShow(){
+    public String getIsDoorTakeShow() {
         return isDoorTakeShow;
     }
+
     /**
      * 璁剧疆 鏄惁鏀寔涓婇棬鏀跺彇鐢宠锛堝惁.鍚︼紝鏄�.鏄級
+     *
      * @param isDoorTakeShow
      */
-    public void setIsDoorTakeShow(String isDoorTakeShow){
+    public void setIsDoorTakeShow(String isDoorTakeShow) {
         this.isDoorTakeShow = isDoorTakeShow;
     }
+
     /**
      * 鑾峰彇 缃戜笂蹇呴』鍒扮幇鍦哄師鍥�
+     *
      * @return String
      */
-    public String getOnlineMustSceneExplain(){
+    public String getOnlineMustSceneExplain() {
         return onlineMustSceneExplain;
     }
+
     /**
      * 璁剧疆 缃戜笂蹇呴』鍒扮幇鍦哄師鍥�
+     *
      * @param onlineMustSceneExplain
      */
-    public void setOnlineMustSceneExplain(String onlineMustSceneExplain){
+    public void setOnlineMustSceneExplain(String onlineMustSceneExplain) {
         this.onlineMustSceneExplain = onlineMustSceneExplain;
     }
+
     /**
      * 鑾峰彇 瀹炴柦涓讳綋
+     *
      * @return String
      */
-    public String getPerformDeptType(){
+    public String getPerformDeptType() {
         return performDeptType;
     }
+
     /**
      * 璁剧疆 瀹炴柦涓讳綋
+     *
      * @param performDeptType
      */
-    public void setPerformDeptType(String performDeptType){
+    public void setPerformDeptType(String performDeptType) {
         this.performDeptType = performDeptType;
     }
+
     /**
      * 鑾峰彇 浜嬮」鐗堟湰
+     *
      * @return String
      */
-    public String getMatterEdition(){
+    public String getMatterEdition() {
         return matterEdition;
     }
+
     /**
      * 璁剧疆 浜嬮」鐗堟湰
+     *
      * @param matterEdition
      */
-    public void setMatterEdition(String matterEdition){
+    public void setMatterEdition(String matterEdition) {
         this.matterEdition = matterEdition;
     }
+
     /**
      * 鑾峰彇 浜嬮」绫诲瀷鍚嶇О锛堣鏀胯鍙�.琛屾斂璁稿彲锛岃鏀垮缃�.琛屾斂澶勭綒锛岃鏀垮己鍒�.琛屾斂寮哄埗锛岃鏀垮緛鏀�.琛屾斂寰佹敹锛岃鏀跨粰浠�.琛屾斂缁欎粯锛岃鏀挎鏌�.琛屾斂妫€鏌ワ紝琛屾斂纭.琛屾斂纭锛岃鏀垮鍔�.琛屾斂濂栧姳锛岃鏀胯鍐�.琛屾斂瑁佸喅锛屽叾浠栬鏀挎潈鍔�.鍏朵粬琛屾斂鏉冨姏锛屼富鍔ㄦ湇鍔�.涓诲姩鏈嶅姟锛屼緷鐢宠鏈嶅姟.渚濈敵璇锋湇鍔★紝鍜ㄨ鏌ヨ.鍜ㄨ鏌ヨ锛屾湭褰掔被浜嬮」.鏈綊绫讳簨椤癸級
+     *
      * @return String
      */
-    public String getEventTypeShow(){
+    public String getEventTypeShow() {
         return eventTypeShow;
     }
+
     /**
      * 璁剧疆 浜嬮」绫诲瀷鍚嶇О锛堣鏀胯鍙�.琛屾斂璁稿彲锛岃鏀垮缃�.琛屾斂澶勭綒锛岃鏀垮己鍒�.琛屾斂寮哄埗锛岃鏀垮緛鏀�.琛屾斂寰佹敹锛岃鏀跨粰浠�.琛屾斂缁欎粯锛岃鏀挎鏌�.琛屾斂妫€鏌ワ紝琛屾斂纭.琛屾斂纭锛岃鏀垮鍔�.琛屾斂濂栧姳锛岃鏀胯鍐�.琛屾斂瑁佸喅锛屽叾浠栬鏀挎潈鍔�.鍏朵粬琛屾斂鏉冨姏锛屼富鍔ㄦ湇鍔�.涓诲姩鏈嶅姟锛屼緷鐢宠鏈嶅姟.渚濈敵璇锋湇鍔★紝鍜ㄨ鏌ヨ.鍜ㄨ鏌ヨ锛屾湭褰掔被浜嬮」.鏈綊绫讳簨椤癸級
+     *
      * @param eventTypeShow
      */
-    public void setEventTypeShow(String eventTypeShow){
+    public void setEventTypeShow(String eventTypeShow) {
         this.eventTypeShow = eventTypeShow;
     }
+
     /**
      * 鑾峰彇 琛屼娇灞傜骇鍚嶇О锛堢渷绾�.鐪佺骇锛屽競绾�.甯傜骇锛屽幙绾�.鍘跨骇锛岄晣[涔� 琛楅亾].闀嘯涔� 琛楅亾]锛屾潙[绀惧尯]绾�.鏉慬绀惧尯]绾э級
+     *
      * @return String
      */
-    public String getPerformHierarchyShow(){
+    public String getPerformHierarchyShow() {
         return performHierarchyShow;
     }
+
     /**
      * 璁剧疆 琛屼娇灞傜骇鍚嶇О锛堢渷绾�.鐪佺骇锛屽競绾�.甯傜骇锛屽幙绾�.鍘跨骇锛岄晣[涔� 琛楅亾].闀嘯涔� 琛楅亾]锛屾潙[绀惧尯]绾�.鏉慬绀惧尯]绾э級
+     *
      * @param performHierarchyShow
      */
-    public void setPerformHierarchyShow(String performHierarchyShow){
+    public void setPerformHierarchyShow(String performHierarchyShow) {
         this.performHierarchyShow = performHierarchyShow;
     }
+
     /**
      * 鑾峰彇 鏉冨姏鏉ユ簮锛堟硶瀹氭湰绾ц浣�.娉曞畾鏈骇琛屼娇锛屼笂绾т笅鏀�.涓婄骇涓嬫斁锛屼笂绾ф巿鏉�.涓婄骇鎺堟潈锛屽悓绾ф巿鏉�.鍚岀骇鎺堟潈锛屼笂绾у鎵�.涓婄骇濮旀墭锛屽悓绾у鎵�.鍚岀骇濮旀墭锛�
+     *
      * @return String
      */
-    public String getPowerSourceShow(){
+    public String getPowerSourceShow() {
         return powerSourceShow;
     }
+
     /**
      * 璁剧疆 鏉冨姏鏉ユ簮锛堟硶瀹氭湰绾ц浣�.娉曞畾鏈骇琛屼娇锛屼笂绾т笅鏀�.涓婄骇涓嬫斁锛屼笂绾ф巿鏉�.涓婄骇鎺堟潈锛屽悓绾ф巿鏉�.鍚岀骇鎺堟潈锛屼笂绾у鎵�.涓婄骇濮旀墭锛屽悓绾у鎵�.鍚岀骇濮旀墭锛�
+     *
      * @param powerSourceShow
      */
-    public void setPowerSourceShow(String powerSourceShow){
+    public void setPowerSourceShow(String powerSourceShow) {
         this.powerSourceShow = powerSourceShow;
     }
+
     /**
      * 鑾峰彇 瀹炴柦涓讳綋鎬ц川锛堟硶瀹氭満鍏�.娉曞畾鏈哄叧锛屾巿鏉冪粍缁�.鎺堟潈缁勭粐锛屽彈濮旀墭缁勭粐.鍙楀鎵樼粍缁囷級
+     *
      * @return String
      */
-    public String getPerformDeptTypeShow(){
+    public String getPerformDeptTypeShow() {
         return performDeptTypeShow;
     }
+
     /**
      * 璁剧疆 瀹炴柦涓讳綋鎬ц川锛堟硶瀹氭満鍏�.娉曞畾鏈哄叧锛屾巿鏉冪粍缁�.鎺堟潈缁勭粐锛屽彈濮旀墭缁勭粐.鍙楀鎵樼粍缁囷級
+     *
      * @param performDeptTypeShow
      */
-    public void setPerformDeptTypeShow(String performDeptTypeShow){
+    public void setPerformDeptTypeShow(String performDeptTypeShow) {
         this.performDeptTypeShow = performDeptTypeShow;
     }
+
     /**
      * 鑾峰彇 鏄惁杩涢┗涓績锛堝惁.鍚︼紝鏄�.鏄級
+     *
      * @return String
      */
-    public String getGoveServiceCenterShow(){
+    public String getGoveServiceCenterShow() {
         return goveServiceCenterShow;
     }
+
     /**
      * 璁剧疆 鏄惁杩涢┗涓績锛堝惁.鍚︼紝鏄�.鏄級
+     *
      * @param goveServiceCenterShow
      */
-    public void setGoveServiceCenterShow(String goveServiceCenterShow){
+    public void setGoveServiceCenterShow(String goveServiceCenterShow) {
         this.goveServiceCenterShow = goveServiceCenterShow;
     }
+
     /**
      * 鑾峰彇 鏄惁绾冲叆渚挎皯鏈嶅姟涓績锛堝惁.鍚︼紝鏄�.鏄級
+     *
      * @return String
      */
-    public String getIsConvenientCenterShow(){
+    public String getIsConvenientCenterShow() {
         return isConvenientCenterShow;
     }
+
     /**
      * 璁剧疆 鏄惁绾冲叆渚挎皯鏈嶅姟涓績锛堝惁.鍚︼紝鏄�.鏄級
+     *
      * @param isConvenientCenterShow
      */
-    public void setIsConvenientCenterShow(String isConvenientCenterShow){
+    public void setIsConvenientCenterShow(String isConvenientCenterShow) {
         this.isConvenientCenterShow = isConvenientCenterShow;
     }
+
     /**
      * 鑾峰彇 鑷姪缁堢鍔炵悊 锛堝惁.鍚︼紝鏄�.鏄級
+     *
      * @return String
      */
-    public String getTerminalHandle(){
+    public String getTerminalHandle() {
         return terminalHandle;
     }
+
     /**
      * 璁剧疆 鑷姪缁堢鍔炵悊 锛堝惁.鍚︼紝鏄�.鏄級
+     *
      * @param terminalHandle
      */
-    public void setTerminalHandle(String terminalHandle){
+    public void setTerminalHandle(String terminalHandle) {
         this.terminalHandle = terminalHandle;
     }
+
     /**
      * 鑾峰彇 鏄惁缃戝姙 锛堝惁.鍚︼紝鏄�.鏄級
+     *
      * @return String
      */
-    public String getIsOnline(){
+    public String getIsOnline() {
         return isOnline;
     }
+
     /**
      * 璁剧疆 鏄惁缃戝姙 锛堝惁.鍚︼紝鏄�.鏄級
+     *
      * @param isOnline
      */
-    public void setIsOnline(String isOnline){
+    public void setIsOnline(String isOnline) {
         this.isOnline = isOnline;
     }
+
     /**
      * 鑾峰彇 鏀寔缃戜笂鏀粯锛堝惁.鍚︼紝鏄�.鏄級
+     *
      * @return String
      */
-    public String getIsOnlinePayShow(){
+    public String getIsOnlinePayShow() {
         return isOnlinePayShow;
     }
+
     /**
      * 璁剧疆 鏀寔缃戜笂鏀粯锛堝惁.鍚︼紝鏄�.鏄級
+     *
      * @param isOnlinePayShow
      */
-    public void setIsOnlinePayShow(String isOnlinePayShow){
+    public void setIsOnlinePayShow(String isOnlinePayShow) {
         this.isOnlinePayShow = isOnlinePayShow;
     }
+
     /**
      * 鑾峰彇 濮旀墭閮ㄩ棬锛堝惁.鍚︼紝鏄�.鏄級
+     *
      * @return String
      */
-    public String getEntrustmentDepartmen(){
+    public String getEntrustmentDepartmen() {
         return entrustmentDepartmen;
     }
+
     /**
      * 璁剧疆 濮旀墭閮ㄩ棬锛堝惁.鍚︼紝鏄�.鏄級
+     *
      * @param entrustmentDepartmen
      */
-    public void setEntrustmentDepartmen(String entrustmentDepartmen){
+    public void setEntrustmentDepartmen(String entrustmentDepartmen) {
         this.entrustmentDepartmen = entrustmentDepartmen;
     }
+
     /**
      * 鑾峰彇 鑱斿姙鏈烘瀯
+     *
      * @return String
      */
-    public String getJointInfoShow(){
+    public String getJointInfoShow() {
         return jointInfoShow;
     }
+
     /**
      * 璁剧疆 鑱斿姙鏈烘瀯
+     *
      * @param jointInfoShow
      */
-    public void setJointInfoShow(String jointInfoShow){
+    public void setJointInfoShow(String jointInfoShow) {
         this.jointInfoShow = jointInfoShow;
     }
+
     /**
      * 鑾峰彇 浜嬮」鐘舵€侊紙鍋滅敤.鍋滅敤锛屽湪鐢�.鍦ㄧ敤锛�
+     *
      * @return String
      */
-    public String getMatterStatus(){
+    public String getMatterStatus() {
         return matterStatus;
     }
+
     /**
      * 璁剧疆 浜嬮」鐘舵€侊紙鍋滅敤.鍋滅敤锛屽湪鐢�.鍦ㄧ敤锛�
+     *
      * @param matterStatus
      */
-    public void setMatterStatus(String matterStatus){
+    public void setMatterStatus(String matterStatus) {
         this.matterStatus = matterStatus;
     }
+
     /**
      * 鑾峰彇 鏁伴噺闄愬埗
+     *
      * @return Long
      */
-    public Long getNumberLimit(){
+    public Long getNumberLimit() {
         return numberLimit;
     }
+
     /**
      * 璁剧疆 鏁伴噺闄愬埗
+     *
      * @param numberLimit
      */
-    public void setNumberLimit(Long numberLimit){
+    public void setNumberLimit(Long numberLimit) {
         this.numberLimit = numberLimit;
     }
+
     /**
      * 鑾峰彇 涓婚绫诲瀷
+     *
      * @return String
      */
-    public String getType(){
+    public String getType() {
         return type;
     }
+
     /**
      * 璁剧疆 涓婚绫诲瀷
+     *
      * @param type
      */
-    public void setType(String type){
+    public void setType(String type) {
         this.type = type;
     }
+
     /**
      * 鑾峰彇 鍩烘湰缂栫爜
+     *
      * @return String
      */
-    public String getBaseCode(){
+    public String getBaseCode() {
         return baseCode;
     }
+
     /**
      * 璁剧疆 鍩烘湰缂栫爜
+     *
      * @param baseCode
      */
-    public void setBaseCode(String baseCode){
+    public void setBaseCode(String baseCode) {
         this.baseCode = baseCode;
     }
+
     /**
      * 鑾峰彇 瀹炴柦缂栫爜
+     *
      * @return String
      */
-    public String getImplementCode(){
+    public String getImplementCode() {
         return implementCode;
     }
+
     /**
      * 璁剧疆 瀹炴柦缂栫爜
+     *
      * @param implementCode
      */
-    public void setImplementCode(String implementCode){
+    public void setImplementCode(String implementCode) {
         this.implementCode = implementCode;
     }
+
     /**
      * 鑾峰彇 瀹炴柦涓讳綋缂栫爜
+     *
      * @return String
      */
-    public String getImplementBodyCode(){
+    public String getImplementBodyCode() {
         return implementBodyCode;
     }
+
     /**
      * 璁剧疆 瀹炴柦涓讳綋缂栫爜
+     *
      * @param implementBodyCode
      */
-    public void setImplementBodyCode(String implementBodyCode){
+    public void setImplementBodyCode(String implementBodyCode) {
         this.implementBodyCode = implementBodyCode;
     }
+
     /**
      * 鑾峰彇 鍔炵悊椤圭紪鐮�
+     *
      * @return String
      */
-    public String getOperateItemCode(){
+    public String getOperateItemCode() {
         return operateItemCode;
     }
+
     /**
      * 璁剧疆 鍔炵悊椤圭紪鐮�
+     *
      * @param operateItemCode
      */
-    public void setOperateItemCode(String operateItemCode){
+    public void setOperateItemCode(String operateItemCode) {
         this.operateItemCode = operateItemCode;
     }
+
     /**
      * 鑾峰彇 涔￠晣琛楅亾鍚嶇О
+     *
      * @return String
      */
-    public String getTownshipName(){
+    public String getTownshipName() {
         return townshipName;
     }
+
     /**
      * 璁剧疆 涔￠晣琛楅亾鍚嶇О
+     *
      * @param townshipName
      */
-    public void setTownshipName(String townshipName){
+    public void setTownshipName(String townshipName) {
         this.townshipName = townshipName;
     }
+
     /**
      * 鑾峰彇 涔￠晣琛楅亾浠ｇ爜
+     *
      * @return String
      */
-    public String getTownshipCode(){
+    public String getTownshipCode() {
         return townshipCode;
     }
+
     /**
      * 璁剧疆 涔￠晣琛楅亾浠ｇ爜
+     *
      * @param townshipCode
      */
-    public void setTownshipCode(String townshipCode){
+    public void setTownshipCode(String townshipCode) {
         this.townshipCode = townshipCode;
     }
+
     /**
      * 鑾峰彇 鏉戝眳绀惧尯鍚嶇О
+     *
      * @return String
      */
-    public String getVillageName(){
+    public String getVillageName() {
         return villageName;
     }
+
     /**
      * 璁剧疆 鏉戝眳绀惧尯鍚嶇О
+     *
      * @param villageName
      */
-    public void setVillageName(String villageName){
+    public void setVillageName(String villageName) {
         this.villageName = villageName;
     }
+
     /**
      * 鑾峰彇 鏉戝眳绀惧尯浠ｇ爜
+     *
      * @return String
      */
-    public String getVillageCode(){
+    public String getVillageCode() {
         return villageCode;
     }
+
     /**
      * 璁剧疆 鏉戝眳绀惧尯浠ｇ爜
+     *
      * @param villageCode
      */
-    public void setVillageCode(String villageCode){
+    public void setVillageCode(String villageCode) {
         this.villageCode = villageCode;
     }
+
     /**
      * 鑾峰彇 鍔炵悊鏃堕棿
+     *
      * @return String
      */
-    public String getOperateTime(){
+    public String getOperateTime() {
         return operateTime;
     }
+
     /**
      * 璁剧疆 鍔炵悊鏃堕棿
+     *
      * @param operateTime
      */
-    public void setOperateTime(String operateTime){
+    public void setOperateTime(String operateTime) {
         this.operateTime = operateTime;
     }
+
     /**
      * 鑾峰彇 鍔炵悊鍦扮偣
+     *
      * @return String
      */
-    public String getOperateSite(){
+    public String getOperateSite() {
         return operateSite;
     }
+
     /**
      * 璁剧疆 鍔炵悊鍦扮偣
+     *
      * @param operateSite
      */
-    public void setOperateSite(String operateSite){
+    public void setOperateSite(String operateSite) {
         this.operateSite = operateSite;
     }
+
     /**
      * 鑾峰彇 鍜ㄨ鏂瑰紡
+     *
      * @return String
      */
-    public String getCousultingShow(){
+    public String getCousultingShow() {
         return cousultingShow;
     }
+
     /**
      * 璁剧疆 鍜ㄨ鏂瑰紡
+     *
      * @param cousultingShow
      */
-    public void setCousultingShow(String cousultingShow){
+    public void setCousultingShow(String cousultingShow) {
         this.cousultingShow = cousultingShow;
     }
+
     /**
      * 鑾峰彇 鍜ㄨ鐢佃瘽
+     *
      * @return String
      */
-    public String getCousultingTelephoneShow(){
+    public String getCousultingTelephoneShow() {
         return cousultingTelephoneShow;
     }
+
     /**
      * 璁剧疆 鍜ㄨ鐢佃瘽
+     *
      * @param cousultingTelephoneShow
      */
-    public void setCousultingTelephoneShow(String cousultingTelephoneShow){
+    public void setCousultingTelephoneShow(String cousultingTelephoneShow) {
         this.cousultingTelephoneShow = cousultingTelephoneShow;
     }
+
     /**
      * 鑾峰彇 鐩戠潱鎶曡瘔鏂瑰紡
+     *
      * @return String
      */
-    public String getSuperviseShow(){
+    public String getSuperviseShow() {
         return superviseShow;
     }
+
     /**
      * 璁剧疆 鐩戠潱鎶曡瘔鏂瑰紡
+     *
      * @param superviseShow
      */
-    public void setSuperviseShow(String superviseShow){
+    public void setSuperviseShow(String superviseShow) {
         this.superviseShow = superviseShow;
     }
+
     /**
      * 鑾峰彇 鎺掑簭
+     *
      * @return Integer
      */
-    public Integer getSort(){
+    public Integer getSort() {
         return sort;
     }
+
     /**
      * 璁剧疆 鎺掑簭
+     *
      * @param sort
      */
-    public void setSort(Integer sort){
+    public void setSort(Integer sort) {
         this.sort = sort;
     }
+
     /**
      * 鑾峰彇 浜嬮」鏉ユ簮(0.鏀垮姟缃戯紝1.鑷畾涔�)
+     *
      * @return Integer
      */
-    public Integer getSource(){
+    public Integer getSource() {
         return source;
     }
+
     /**
      * 璁剧疆 浜嬮」鏉ユ簮(0.鏀垮姟缃戯紝1.鑷畾涔�)
+     *
      * @param source
      */
-    public void setSource(Integer source){
+    public void setSource(Integer source) {
         this.source = source;
     }
+
     /**
      * 鑾峰彇 璇勪环鍦板潃
+     *
      * @return String
      */
-    public String getEvaluationUrl(){
+    public String getEvaluationUrl() {
         return evaluationUrl;
     }
+
     /**
      * 璁剧疆 璇勪环鍦板潃
+     *
      * @param evaluationUrl
      */
-    public void setEvaluationUrl(String evaluationUrl){
+    public void setEvaluationUrl(String evaluationUrl) {
         this.evaluationUrl = evaluationUrl;
     }
+
     /**
      * 鑾峰彇 鐢宠鍦板潃
+     *
      * @return String
      */
-    public String getNetApplyUrl(){
+    public String getNetApplyUrl() {
         return netApplyUrl;
     }
+
     /**
      * 璁剧疆 鐢宠鍦板潃
+     *
      * @param netApplyUrl
      */
-    public void setNetApplyUrl(String netApplyUrl){
+    public void setNetApplyUrl(String netApplyUrl) {
         this.netApplyUrl = netApplyUrl;
     }
 
 
-    public List<MatterExtEntity> getMatterExtList(){
+    public List<MatterExtEntity> getMatterExtList() {
         return matterExtList;
     }
 
-    public void setMatterExtList(List<MatterExtEntity> matterExtList){
+    public void setMatterExtList(List<MatterExtEntity> matterExtList) {
         this.matterExtList = matterExtList;
     }
 
@@ -1391,6 +1696,7 @@ public class MatterEntity extends MatterVo {
     public int hashCode() {
         return this.getId().hashCode();
     }
+
     @Override
     public boolean equals(Object obj) {
         if (obj == null) return false;
@@ -1403,7 +1709,7 @@ public class MatterEntity extends MatterVo {
         return false;
     }
 
-    public String toString(){
+    public String toString() {
         StringBuilder sb = new StringBuilder("");
         sb.append(",siteId:").append(getSiteId());
         sb.append(",tid:").append(getTid());
@@ -1483,11 +1789,11 @@ public class MatterEntity extends MatterVo {
         return sb.toString();
     }
 
-    public void initAttrValue(){
+    public void initAttrValue() {
 
         this.siteId = -1L;
 
-        this.tid = null;
+        this.tid = "";
 
         this.tcode = "";
 
@@ -1497,23 +1803,23 @@ public class MatterEntity extends MatterVo {
 
         this.englishName = "";
 
-        this.matterNo = null;
+        this.matterNo = "";
 
-        this.areaCode = null;
+        this.areaCode = "";
 
         this.deptCode = "";
 
         this.deptName = "";
 
-        this.powerCode = null;
+        this.powerCode = "";
 
-        this.themeCode = null;
+        this.themeCode = "";
 
-        this.usertypeCode = null;
+        this.usertypeCode = "";
 
-        this.groupName = null;
+        this.groupName = "";
 
-        this.url = null;
+        this.url = "";
 
         this.haveGetMatterInfo = "false";
 
@@ -1527,13 +1833,13 @@ public class MatterEntity extends MatterVo {
 
         this.handleType = "绐楀彛鍔炵悊";
 
-        this.legalTimeLimitShow = null;
+        this.legalTimeLimitShow = "";
 
-        this.legalEndExplain = null;
+        this.legalEndExplain = "";
 
-        this.promiseTimeLimitShow = null;
+        this.promiseTimeLimitShow = "";
 
-        this.promiseEndExplain = null;
+        this.promiseEndExplain = "";
 
         this.isChargesShow = "鍚�";
 
@@ -1543,7 +1849,7 @@ public class MatterEntity extends MatterVo {
 
         this.promiseTakeTime = null;
 
-        this.specialProcedure = null;
+        this.specialProcedure = "";
 
         this.windowToTheSceneNum = null;
 
@@ -1555,7 +1861,7 @@ public class MatterEntity extends MatterVo {
 
         this.isApplyProvinceShow = "鍚�";
 
-        this.mustSceneExplain = null;
+        this.mustSceneExplain = "";
 
         this.onlineType = "鍘熶欢棰勫";
 
@@ -1563,23 +1869,23 @@ public class MatterEntity extends MatterVo {
 
         this.onlineOperatDeep = "浜掕仈缃戝挩璇�";
 
-        this.isExpressTakeOnlineShow = null;
+        this.isExpressTakeOnlineShow = "";
 
         this.isDoorTakeShow = "鍚�";
 
-        this.onlineMustSceneExplain = null;
+        this.onlineMustSceneExplain = "";
 
-        this.performDeptType = null;
+        this.performDeptType = "";
 
-        this.matterEdition = null;
+        this.matterEdition = "";
 
         this.eventTypeShow = "琛屾斂璁稿彲";
 
-        this.performHierarchyShow = null;
+        this.performHierarchyShow = "";
 
-        this.powerSourceShow = null;
+        this.powerSourceShow = "";
 
-        this.performDeptTypeShow = null;
+        this.performDeptTypeShow = "";
 
         this.goveServiceCenterShow = "鍚�";
 
@@ -1593,7 +1899,7 @@ public class MatterEntity extends MatterVo {
 
         this.entrustmentDepartmen = "鏄�";
 
-        this.jointInfoShow = null;
+        this.jointInfoShow = "";
 
         this.matterStatus = "鍦ㄧ敤";
 
@@ -1601,31 +1907,31 @@ public class MatterEntity extends MatterVo {
 
         this.type = "";
 
-        this.baseCode = null;
+        this.baseCode = "";
 
-        this.implementCode = null;
+        this.implementCode = "";
 
-        this.implementBodyCode = null;
+        this.implementBodyCode = "";
 
-        this.operateItemCode = null;
+        this.operateItemCode = "";
 
-        this.townshipName = null;
+        this.townshipName = "";
 
-        this.townshipCode = null;
+        this.townshipCode = "";
 
-        this.villageName = null;
+        this.villageName = "";
 
-        this.villageCode = null;
+        this.villageCode = "";
 
-        this.operateTime = null;
+        this.operateTime = "";
 
-        this.operateSite = null;
+        this.operateSite = "";
 
-        this.cousultingShow = null;
+        this.cousultingShow = "";
 
-        this.cousultingTelephoneShow = null;
+        this.cousultingTelephoneShow = "";
 
-        this.superviseShow = null;
+        this.superviseShow = "";
 
         this.sort = 0;
 
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java b/base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
index c356679072ea9719be4f5314ade332c392fa53b8..7133f92f532424d86394ad82f54bb04519e42d4d 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
@@ -986,6 +986,14 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
             Setting baseInfoSetting = interceptorConfig.getBaseInfoSetting();
             Setting sqclInfoSetting = interceptorConfig.getSqclInfoSetting();
 
+            //鏇存柊閮ㄩ棬淇℃伅
+            DeptEntity extCache = deptService.getExtCache(matterEntity.getDeptCode());
+            matterEntity.setDeptName(extCache==null?"":extCache.getName());
+
+/*            if(!ObjectUtils.isEmpty(matterEntity.getDeptCode())&&ObjectUtils.isEmpty(matterEntity.getDeptName())){
+                DeptEntity extCache = deptService.getExtCache(matterEntity.getDeptCode());
+                matterEntity.setDeptName(extCache==null?"":extCache.getName());
+            }*/
             //鏋勫缓鍩虹淇℃伅鍙傛暟
             savebaseInfo(matterEntity, dom, baseInfoSetting);
 
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteBusinessQuery.java b/base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteBusinessQuery.java
index 11121e8a0dc7ca4e24b71be89be7e323e334eb56..eef746e52093c65cbea44cc3e4979ea450d599c2 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteBusinessQuery.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteBusinessQuery.java
@@ -3,11 +3,11 @@ package com.mortals.xhx.module.site.model;
 import java.util.List;
 import com.mortals.xhx.module.site.model.SiteBusinessEntity;
 /**
-* 绔欑偣浜嬮」鏌ヨ瀵硅薄
-*
-* @author zxfei
-* @date 2022-01-13
-*/
+ * 绔欑偣涓氬姟鏌ヨ瀵硅薄
+ *
+ * @author zxfei
+ * @date 2023-02-08
+ */
 public class SiteBusinessQuery extends SiteBusinessEntity {
     /** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
     private Long idStart;
@@ -21,6 +21,9 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
     /** 搴忓彿锛屼富閿紝鑷闀垮垪琛� */
     private List <Long> idList;
 
+    /** 搴忓彿锛屼富閿紝鑷闀挎帓闄ゅ垪琛� */
+    private List <Long> idNotList;
+
     /** 寮€濮� 绔欑偣ID */
     private Long siteIdStart;
 
@@ -33,9 +36,15 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
     /** 绔欑偣ID鍒楄〃 */
     private List <Long> siteIdList;
 
+    /** 绔欑偣ID鎺掗櫎鍒楄〃 */
+    private List <Long> siteIdNotList;
+
     /** 绔欑偣鍚嶇О */
     private List<String> siteNameList;
 
+    /** 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧 */
+    private List<String> ancestorsList;
+
     /** 寮€濮� 涓氬姟ID */
     private Long businessIdStart;
 
@@ -48,35 +57,8 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
     /** 涓氬姟ID鍒楄〃 */
     private List <Long> businessIdList;
 
-    /** 涓氬姟鍚嶇О */
-    private List<String> businessNameList;
-
-    /** 寮€濮� 鍒涘缓鏃堕棿 */
-    private String createTimeStart;
-
-    /** 缁撴潫 鍒涘缓鏃堕棿 */
-    private String createTimeEnd;
-
-    /** 寮€濮� 鍒涘缓鐢ㄦ埛 */
-    private Long createUserIdStart;
-
-    /** 缁撴潫 鍒涘缓鐢ㄦ埛 */
-    private Long createUserIdEnd;
-
-    /** 澧炲姞 鍒涘缓鐢ㄦ埛 */
-    private Long createUserIdIncrement;
-
-    /** 鍒涘缓鐢ㄦ埛鍒楄〃 */
-    private List <Long> createUserIdList;
-
-    /** 寮€濮� 淇敼鏃堕棿 */
-    private String updateTimeStart;
-
-    /** 缁撴潫 淇敼鏃堕棿 */
-    private String updateTimeEnd;
-
-    /** 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧 */
-    private List<String> ancestorsList;
+    /** 涓氬姟ID鎺掗櫎鍒楄〃 */
+    private List <Long> businessIdNotList;
 
     /** 寮€濮� 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟) */
     private Integer isBusinessStart;
@@ -90,6 +72,9 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
     /** 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)鍒楄〃 */
     private List <Integer> isBusinessList;
 
+    /** 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)鎺掗櫎鍒楄〃 */
+    private List <Integer> isBusinessNotList;
+
     /** 寮€濮� 涓氬姟鐖剁骇ID */
     private Long parentIdStart;
 
@@ -102,6 +87,12 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
     /** 涓氬姟鐖剁骇ID鍒楄〃 */
     private List <Long> parentIdList;
 
+    /** 涓氬姟鐖剁骇ID鎺掗櫎鍒楄〃 */
+    private List <Long> parentIdNotList;
+
+    /** 涓氬姟鍚嶇О */
+    private List<String> businessNameList;
+
     /** 寮€濮� 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父) */
     private Integer statusStart;
 
@@ -114,6 +105,36 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
     /** 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)鍒楄〃 */
     private List <Integer> statusList;
 
+    /** 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)鎺掗櫎鍒楄〃 */
+    private List <Integer> statusNotList;
+
+    /** 寮€濮� 鍒涘缓鏃堕棿 */
+    private String createTimeStart;
+
+    /** 缁撴潫 鍒涘缓鏃堕棿 */
+    private String createTimeEnd;
+
+    /** 寮€濮� 鍒涘缓鐢ㄦ埛 */
+    private Long createUserIdStart;
+
+    /** 缁撴潫 鍒涘缓鐢ㄦ埛 */
+    private Long createUserIdEnd;
+
+    /** 澧炲姞 鍒涘缓鐢ㄦ埛 */
+    private Long createUserIdIncrement;
+
+    /** 鍒涘缓鐢ㄦ埛鍒楄〃 */
+    private List <Long> createUserIdList;
+
+    /** 鍒涘缓鐢ㄦ埛鎺掗櫎鍒楄〃 */
+    private List <Long> createUserIdNotList;
+
+    /** 寮€濮� 淇敼鏃堕棿 */
+    private String updateTimeStart;
+
+    /** 缁撴潫 淇敼鏃堕棿 */
+    private String updateTimeEnd;
+
     /** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<SiteBusinessQuery> orConditionList;
 
@@ -123,964 +144,1146 @@ public class SiteBusinessQuery extends SiteBusinessEntity {
     public SiteBusinessQuery(){}
 
     /**
-    * 鑾峰彇 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
-    * @return idStart
-    */
+     * 鑾峰彇 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
+     * @return idStart
+     */
     public Long getIdStart(){
         return this.idStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
-    * @param idStart
-    */
+     * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
+     * @param idStart
+     */
     public void setIdStart(Long idStart){
         this.idStart = idStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
-    * @return $idEnd
-    */
+     * 鑾峰彇 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
+     * @return $idEnd
+     */
     public Long getIdEnd(){
         return this.idEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
-    * @param idEnd
-    */
+     * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
+     * @param idEnd
+     */
     public void setIdEnd(Long idEnd){
         this.idEnd = idEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
-    * @return idIncrement
-    */
+     * 鑾峰彇 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
+     * @return idIncrement
+     */
     public Long getIdIncrement(){
         return this.idIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
-    * @param idIncrement
-    */
+     * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
+     * @param idIncrement
+     */
     public void setIdIncrement(Long idIncrement){
         this.idIncrement = idIncrement;
     }
 
     /**
-    * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀�
-    * @return idList
-    */
+     * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀�
+     * @return idList
+     */
     public List<Long> getIdList(){
         return this.idList;
     }
 
     /**
-    * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
-    * @param idList
-    */
+     * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+     * @param idList
+     */
     public void setIdList(List<Long> idList){
         this.idList = idList;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 绔欑偣ID
-    * @return siteIdStart
-    */
+     * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀�
+     * @return idNotList
+     */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+     * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+     * @param idList
+     */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+     * 鑾峰彇 寮€濮� 绔欑偣ID
+     * @return siteIdStart
+     */
     public Long getSiteIdStart(){
         return this.siteIdStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 绔欑偣ID
-    * @param siteIdStart
-    */
+     * 璁剧疆 寮€濮� 绔欑偣ID
+     * @param siteIdStart
+     */
     public void setSiteIdStart(Long siteIdStart){
         this.siteIdStart = siteIdStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 绔欑偣ID
-    * @return $siteIdEnd
-    */
+     * 鑾峰彇 缁撴潫 绔欑偣ID
+     * @return $siteIdEnd
+     */
     public Long getSiteIdEnd(){
         return this.siteIdEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 绔欑偣ID
-    * @param siteIdEnd
-    */
+     * 璁剧疆 缁撴潫 绔欑偣ID
+     * @param siteIdEnd
+     */
     public void setSiteIdEnd(Long siteIdEnd){
         this.siteIdEnd = siteIdEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 绔欑偣ID
-    * @return siteIdIncrement
-    */
+     * 鑾峰彇 澧炲姞 绔欑偣ID
+     * @return siteIdIncrement
+     */
     public Long getSiteIdIncrement(){
         return this.siteIdIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 绔欑偣ID
-    * @param siteIdIncrement
-    */
+     * 璁剧疆 澧炲姞 绔欑偣ID
+     * @param siteIdIncrement
+     */
     public void setSiteIdIncrement(Long siteIdIncrement){
         this.siteIdIncrement = siteIdIncrement;
     }
 
     /**
-    * 鑾峰彇 绔欑偣ID
-    * @return siteIdList
-    */
+     * 鑾峰彇 绔欑偣ID
+     * @return siteIdList
+     */
     public List<Long> getSiteIdList(){
         return this.siteIdList;
     }
 
     /**
-    * 璁剧疆 绔欑偣ID
-    * @param siteIdList
-    */
+     * 璁剧疆 绔欑偣ID
+     * @param siteIdList
+     */
     public void setSiteIdList(List<Long> siteIdList){
         this.siteIdList = siteIdList;
     }
 
     /**
-    * 鑾峰彇 绔欑偣鍚嶇О
-    * @return siteNameList
-    */
+     * 鑾峰彇 绔欑偣ID
+     * @return siteIdNotList
+     */
+    public List<Long> getSiteIdNotList(){
+        return this.siteIdNotList;
+    }
+
+    /**
+     * 璁剧疆 绔欑偣ID
+     * @param siteIdList
+     */
+    public void setSiteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+    }
+
+
+    /**
+     * 鑾峰彇 绔欑偣鍚嶇О
+     * @return siteNameList
+     */
     public List<String> getSiteNameList(){
         return this.siteNameList;
     }
 
     /**
-    * 璁剧疆 绔欑偣鍚嶇О
-    * @param siteNameList
-    */
+     * 璁剧疆 绔欑偣鍚嶇О
+     * @param siteNameList
+     */
     public void setSiteNameList(List<String> siteNameList){
         this.siteNameList = siteNameList;
     }
     /**
-    * 鑾峰彇 寮€濮� 涓氬姟ID
-    * @return businessIdStart
-    */
+     * 鑾峰彇 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
+     * @return ancestorsList
+     */
+    public List<String> getAncestorsList(){
+        return this.ancestorsList;
+    }
+
+    /**
+     * 璁剧疆 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
+     * @param ancestorsList
+     */
+    public void setAncestorsList(List<String> ancestorsList){
+        this.ancestorsList = ancestorsList;
+    }
+    /**
+     * 鑾峰彇 寮€濮� 涓氬姟ID
+     * @return businessIdStart
+     */
     public Long getBusinessIdStart(){
         return this.businessIdStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 涓氬姟ID
-    * @param businessIdStart
-    */
+     * 璁剧疆 寮€濮� 涓氬姟ID
+     * @param businessIdStart
+     */
     public void setBusinessIdStart(Long businessIdStart){
         this.businessIdStart = businessIdStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 涓氬姟ID
-    * @return $businessIdEnd
-    */
+     * 鑾峰彇 缁撴潫 涓氬姟ID
+     * @return $businessIdEnd
+     */
     public Long getBusinessIdEnd(){
         return this.businessIdEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 涓氬姟ID
-    * @param businessIdEnd
-    */
+     * 璁剧疆 缁撴潫 涓氬姟ID
+     * @param businessIdEnd
+     */
     public void setBusinessIdEnd(Long businessIdEnd){
         this.businessIdEnd = businessIdEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 涓氬姟ID
-    * @return businessIdIncrement
-    */
+     * 鑾峰彇 澧炲姞 涓氬姟ID
+     * @return businessIdIncrement
+     */
     public Long getBusinessIdIncrement(){
         return this.businessIdIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 涓氬姟ID
-    * @param businessIdIncrement
-    */
+     * 璁剧疆 澧炲姞 涓氬姟ID
+     * @param businessIdIncrement
+     */
     public void setBusinessIdIncrement(Long businessIdIncrement){
         this.businessIdIncrement = businessIdIncrement;
     }
 
     /**
-    * 鑾峰彇 涓氬姟ID
-    * @return businessIdList
-    */
+     * 鑾峰彇 涓氬姟ID
+     * @return businessIdList
+     */
     public List<Long> getBusinessIdList(){
         return this.businessIdList;
     }
 
     /**
-    * 璁剧疆 涓氬姟ID
-    * @param businessIdList
-    */
+     * 璁剧疆 涓氬姟ID
+     * @param businessIdList
+     */
     public void setBusinessIdList(List<Long> businessIdList){
         this.businessIdList = businessIdList;
     }
 
     /**
-    * 鑾峰彇 涓氬姟鍚嶇О
-    * @return businessNameList
-    */
-    public List<String> getBusinessNameList(){
-        return this.businessNameList;
+     * 鑾峰彇 涓氬姟ID
+     * @return businessIdNotList
+     */
+    public List<Long> getBusinessIdNotList(){
+        return this.businessIdNotList;
     }
 
     /**
-    * 璁剧疆 涓氬姟鍚嶇О
-    * @param businessNameList
-    */
-    public void setBusinessNameList(List<String> businessNameList){
-        this.businessNameList = businessNameList;
+     * 璁剧疆 涓氬姟ID
+     * @param businessIdList
+     */
+    public void setBusinessIdNotList(List<Long> businessIdNotList){
+        this.businessIdNotList = businessIdNotList;
     }
+
+
     /**
-    * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
-    * @return createTimeStart
-    */
-    public String getCreateTimeStart(){
-        return this.createTimeStart;
+     * 鑾峰彇 寮€濮� 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
+     * @return isBusinessStart
+     */
+    public Integer getIsBusinessStart(){
+        return this.isBusinessStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
-    * @param createTimeStart
-    */
-    public void setCreateTimeStart(String createTimeStart){
-        this.createTimeStart = createTimeStart;
+     * 璁剧疆 寮€濮� 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
+     * @param isBusinessStart
+     */
+    public void setIsBusinessStart(Integer isBusinessStart){
+        this.isBusinessStart = isBusinessStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
-    * @return createTimeEnd
-    */
-    public String getCreateTimeEnd(){
-        return this.createTimeEnd;
+     * 鑾峰彇 缁撴潫 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
+     * @return $isBusinessEnd
+     */
+    public Integer getIsBusinessEnd(){
+        return this.isBusinessEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
-    * @param createTimeEnd
-    */
-    public void setCreateTimeEnd(String createTimeEnd){
-        this.createTimeEnd = createTimeEnd;
+     * 璁剧疆 缁撴潫 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
+     * @param isBusinessEnd
+     */
+    public void setIsBusinessEnd(Integer isBusinessEnd){
+        this.isBusinessEnd = isBusinessEnd;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛
-    * @return createUserIdStart
-    */
-    public Long getCreateUserIdStart(){
-        return this.createUserIdStart;
+     * 鑾峰彇 澧炲姞 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
+     * @return isBusinessIncrement
+     */
+    public Integer getIsBusinessIncrement(){
+        return this.isBusinessIncrement;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
-    * @param createUserIdStart
-    */
-    public void setCreateUserIdStart(Long createUserIdStart){
-        this.createUserIdStart = createUserIdStart;
+     * 璁剧疆 澧炲姞 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
+     * @param isBusinessIncrement
+     */
+    public void setIsBusinessIncrement(Integer isBusinessIncrement){
+        this.isBusinessIncrement = isBusinessIncrement;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛
-    * @return $createUserIdEnd
-    */
-    public Long getCreateUserIdEnd(){
-        return this.createUserIdEnd;
+     * 鑾峰彇 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
+     * @return isBusinessList
+     */
+    public List<Integer> getIsBusinessList(){
+        return this.isBusinessList;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
-    * @param createUserIdEnd
-    */
-    public void setCreateUserIdEnd(Long createUserIdEnd){
-        this.createUserIdEnd = createUserIdEnd;
+     * 璁剧疆 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
+     * @param isBusinessList
+     */
+    public void setIsBusinessList(List<Integer> isBusinessList){
+        this.isBusinessList = isBusinessList;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛
-    * @return createUserIdIncrement
-    */
-    public Long getCreateUserIdIncrement(){
-        return this.createUserIdIncrement;
+     * 鑾峰彇 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
+     * @return isBusinessNotList
+     */
+    public List<Integer> getIsBusinessNotList(){
+        return this.isBusinessNotList;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
-    * @param createUserIdIncrement
-    */
-    public void setCreateUserIdIncrement(Long createUserIdIncrement){
-        this.createUserIdIncrement = createUserIdIncrement;
+     * 璁剧疆 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
+     * @param isBusinessList
+     */
+    public void setIsBusinessNotList(List<Integer> isBusinessNotList){
+        this.isBusinessNotList = isBusinessNotList;
     }
 
+
     /**
-    * 鑾峰彇 鍒涘缓鐢ㄦ埛
-    * @return createUserIdList
-    */
-    public List<Long> getCreateUserIdList(){
-        return this.createUserIdList;
+     * 鑾峰彇 寮€濮� 涓氬姟鐖剁骇ID
+     * @return parentIdStart
+     */
+    public Long getParentIdStart(){
+        return this.parentIdStart;
     }
 
     /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛
-    * @param createUserIdList
-    */
-    public void setCreateUserIdList(List<Long> createUserIdList){
-        this.createUserIdList = createUserIdList;
+     * 璁剧疆 寮€濮� 涓氬姟鐖剁骇ID
+     * @param parentIdStart
+     */
+    public void setParentIdStart(Long parentIdStart){
+        this.parentIdStart = parentIdStart;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 淇敼鏃堕棿
-    * @return updateTimeStart
-    */
-    public String getUpdateTimeStart(){
-        return this.updateTimeStart;
+     * 鑾峰彇 缁撴潫 涓氬姟鐖剁骇ID
+     * @return $parentIdEnd
+     */
+    public Long getParentIdEnd(){
+        return this.parentIdEnd;
     }
 
     /**
-    * 璁剧疆 寮€濮� 淇敼鏃堕棿
-    * @param updateTimeStart
-    */
-    public void setUpdateTimeStart(String updateTimeStart){
-        this.updateTimeStart = updateTimeStart;
+     * 璁剧疆 缁撴潫 涓氬姟鐖剁骇ID
+     * @param parentIdEnd
+     */
+    public void setParentIdEnd(Long parentIdEnd){
+        this.parentIdEnd = parentIdEnd;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 淇敼鏃堕棿
-    * @return updateTimeEnd
-    */
-    public String getUpdateTimeEnd(){
-        return this.updateTimeEnd;
+     * 鑾峰彇 澧炲姞 涓氬姟鐖剁骇ID
+     * @return parentIdIncrement
+     */
+    public Long getParentIdIncrement(){
+        return this.parentIdIncrement;
     }
 
     /**
-    * 璁剧疆 缁撴潫 淇敼鏃堕棿
-    * @param updateTimeEnd
-    */
-    public void setUpdateTimeEnd(String updateTimeEnd){
-        this.updateTimeEnd = updateTimeEnd;
+     * 璁剧疆 澧炲姞 涓氬姟鐖剁骇ID
+     * @param parentIdIncrement
+     */
+    public void setParentIdIncrement(Long parentIdIncrement){
+        this.parentIdIncrement = parentIdIncrement;
     }
 
     /**
-    * 鑾峰彇 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
-    * @return ancestorsList
-    */
-    public List<String> getAncestorsList(){
-        return this.ancestorsList;
+     * 鑾峰彇 涓氬姟鐖剁骇ID
+     * @return parentIdList
+     */
+    public List<Long> getParentIdList(){
+        return this.parentIdList;
     }
 
     /**
-    * 璁剧疆 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
-    * @param ancestorsList
-    */
-    public void setAncestorsList(List<String> ancestorsList){
-        this.ancestorsList = ancestorsList;
+     * 璁剧疆 涓氬姟鐖剁骇ID
+     * @param parentIdList
+     */
+    public void setParentIdList(List<Long> parentIdList){
+        this.parentIdList = parentIdList;
     }
+
     /**
-    * 鑾峰彇 寮€濮� 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
-    * @return isBusinessStart
-    */
-    public Integer getIsBusinessStart(){
-        return this.isBusinessStart;
+     * 鑾峰彇 涓氬姟鐖剁骇ID
+     * @return parentIdNotList
+     */
+    public List<Long> getParentIdNotList(){
+        return this.parentIdNotList;
     }
 
     /**
-    * 璁剧疆 寮€濮� 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
-    * @param isBusinessStart
-    */
-    public void setIsBusinessStart(Integer isBusinessStart){
-        this.isBusinessStart = isBusinessStart;
+     * 璁剧疆 涓氬姟鐖剁骇ID
+     * @param parentIdList
+     */
+    public void setParentIdNotList(List<Long> parentIdNotList){
+        this.parentIdNotList = parentIdNotList;
     }
 
+
     /**
-    * 鑾峰彇 缁撴潫 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
-    * @return $isBusinessEnd
-    */
-    public Integer getIsBusinessEnd(){
-        return this.isBusinessEnd;
+     * 鑾峰彇 涓氬姟鍚嶇О
+     * @return businessNameList
+     */
+    public List<String> getBusinessNameList(){
+        return this.businessNameList;
     }
 
     /**
-    * 璁剧疆 缁撴潫 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
-    * @param isBusinessEnd
-    */
-    public void setIsBusinessEnd(Integer isBusinessEnd){
-        this.isBusinessEnd = isBusinessEnd;
+     * 璁剧疆 涓氬姟鍚嶇О
+     * @param businessNameList
+     */
+    public void setBusinessNameList(List<String> businessNameList){
+        this.businessNameList = businessNameList;
+    }
+    /**
+     * 鑾峰彇 寮€濮� 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+     * @return statusStart
+     */
+    public Integer getStatusStart(){
+        return this.statusStart;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
-    * @return isBusinessIncrement
-    */
-    public Integer getIsBusinessIncrement(){
-        return this.isBusinessIncrement;
+     * 璁剧疆 寮€濮� 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+     * @param statusStart
+     */
+    public void setStatusStart(Integer statusStart){
+        this.statusStart = statusStart;
     }
 
     /**
-    * 璁剧疆 澧炲姞 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
-    * @param isBusinessIncrement
-    */
-    public void setIsBusinessIncrement(Integer isBusinessIncrement){
-        this.isBusinessIncrement = isBusinessIncrement;
+     * 鑾峰彇 缁撴潫 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+     * @return $statusEnd
+     */
+    public Integer getStatusEnd(){
+        return this.statusEnd;
     }
 
     /**
-    * 鑾峰彇 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
-    * @return isBusinessList
-    */
-    public List<Integer> getIsBusinessList(){
-        return this.isBusinessList;
+     * 璁剧疆 缁撴潫 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+     * @param statusEnd
+     */
+    public void setStatusEnd(Integer statusEnd){
+        this.statusEnd = statusEnd;
     }
 
     /**
-    * 璁剧疆 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
-    * @param isBusinessList
-    */
-    public void setIsBusinessList(List<Integer> isBusinessList){
-        this.isBusinessList = isBusinessList;
+     * 鑾峰彇 澧炲姞 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+     * @return statusIncrement
+     */
+    public Integer getStatusIncrement(){
+        return this.statusIncrement;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 涓氬姟鐖剁骇ID
-    * @return parentIdStart
-    */
-    public Long getParentIdStart(){
-        return this.parentIdStart;
+     * 璁剧疆 澧炲姞 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+     * @param statusIncrement
+     */
+    public void setStatusIncrement(Integer statusIncrement){
+        this.statusIncrement = statusIncrement;
     }
 
     /**
-    * 璁剧疆 寮€濮� 涓氬姟鐖剁骇ID
-    * @param parentIdStart
-    */
-    public void setParentIdStart(Long parentIdStart){
-        this.parentIdStart = parentIdStart;
+     * 鑾峰彇 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+     * @return statusList
+     */
+    public List<Integer> getStatusList(){
+        return this.statusList;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 涓氬姟鐖剁骇ID
-    * @return $parentIdEnd
-    */
-    public Long getParentIdEnd(){
-        return this.parentIdEnd;
+     * 璁剧疆 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+     * @param statusList
+     */
+    public void setStatusList(List<Integer> statusList){
+        this.statusList = statusList;
     }
 
     /**
-    * 璁剧疆 缁撴潫 涓氬姟鐖剁骇ID
-    * @param parentIdEnd
-    */
-    public void setParentIdEnd(Long parentIdEnd){
-        this.parentIdEnd = parentIdEnd;
+     * 鑾峰彇 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+     * @return statusNotList
+     */
+    public List<Integer> getStatusNotList(){
+        return this.statusNotList;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 涓氬姟鐖剁骇ID
-    * @return parentIdIncrement
-    */
-    public Long getParentIdIncrement(){
-        return this.parentIdIncrement;
+     * 璁剧疆 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+     * @param statusList
+     */
+    public void setStatusNotList(List<Integer> statusNotList){
+        this.statusNotList = statusNotList;
     }
 
+
     /**
-    * 璁剧疆 澧炲姞 涓氬姟鐖剁骇ID
-    * @param parentIdIncrement
-    */
-    public void setParentIdIncrement(Long parentIdIncrement){
-        this.parentIdIncrement = parentIdIncrement;
+     * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
+     * @return createTimeStart
+     */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
     }
 
     /**
-    * 鑾峰彇 涓氬姟鐖剁骇ID
-    * @return parentIdList
-    */
-    public List<Long> getParentIdList(){
-        return this.parentIdList;
+     * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
+     * @param createTimeStart
+     */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
     }
 
     /**
-    * 璁剧疆 涓氬姟鐖剁骇ID
-    * @param parentIdList
-    */
-    public void setParentIdList(List<Long> parentIdList){
-        this.parentIdList = parentIdList;
+     * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
+     * @return createTimeEnd
+     */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
-    * @return statusStart
-    */
-    public Integer getStatusStart(){
-        return this.statusStart;
+     * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
+     * @param createTimeEnd
+     */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
     }
 
     /**
-    * 璁剧疆 寮€濮� 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
-    * @param statusStart
-    */
-    public void setStatusStart(Integer statusStart){
-        this.statusStart = statusStart;
+     * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛
+     * @return createUserIdStart
+     */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
-    * @return $statusEnd
-    */
-    public Integer getStatusEnd(){
-        return this.statusEnd;
+     * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
+     * @param createUserIdStart
+     */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
     }
 
     /**
-    * 璁剧疆 缁撴潫 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
-    * @param statusEnd
-    */
-    public void setStatusEnd(Integer statusEnd){
-        this.statusEnd = statusEnd;
+     * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛
+     * @return $createUserIdEnd
+     */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
-    * @return statusIncrement
-    */
-    public Integer getStatusIncrement(){
-        return this.statusIncrement;
+     * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
+     * @param createUserIdEnd
+     */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
     }
 
     /**
-    * 璁剧疆 澧炲姞 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
-    * @param statusIncrement
-    */
-    public void setStatusIncrement(Integer statusIncrement){
-        this.statusIncrement = statusIncrement;
+     * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛
+     * @return createUserIdIncrement
+     */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
     }
 
     /**
-    * 鑾峰彇 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
-    * @return statusList
-    */
-    public List<Integer> getStatusList(){
-        return this.statusList;
+     * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
+     * @param createUserIdIncrement
+     */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
     }
 
     /**
-    * 璁剧疆 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
-    * @param statusList
-    */
-    public void setStatusList(List<Integer> statusList){
-        this.statusList = statusList;
+     * 鑾峰彇 鍒涘缓鐢ㄦ埛
+     * @return createUserIdList
+     */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
     }
 
     /**
-    * 璁剧疆  搴忓彿锛屼富閿紝鑷闀�
-    * @param id
-    */
+     * 璁剧疆 鍒涘缓鐢ㄦ埛
+     * @param createUserIdList
+     */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+     * 鑾峰彇 鍒涘缓鐢ㄦ埛
+     * @return createUserIdNotList
+     */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+     * 璁剧疆 鍒涘缓鐢ㄦ埛
+     * @param createUserIdList
+     */
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+    }
+
+
+    /**
+     * 鑾峰彇 寮€濮� 淇敼鏃堕棿
+     * @return updateTimeStart
+     */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 淇敼鏃堕棿
+     * @param updateTimeStart
+     */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+     * 鑾峰彇 缁撴潫 淇敼鏃堕棿
+     * @return updateTimeEnd
+     */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+     * 璁剧疆 缁撴潫 淇敼鏃堕棿
+     * @param updateTimeEnd
+     */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+     * 璁剧疆  搴忓彿锛屼富閿紝鑷闀�
+     * @param id
+     */
     public SiteBusinessQuery id(Long id){
-	    setId(id);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
-    * @param idStart
-    */
+        setId(id);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
+     * @param idStart
+     */
     public SiteBusinessQuery idStart(Long idStart){
-		this.idStart = idStart;
-		return this;
+        this.idStart = idStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
-    * @param idEnd
-    */
+     * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
+     * @param idEnd
+     */
     public SiteBusinessQuery idEnd(Long idEnd){
-		this.idEnd = idEnd;
-		return this;
+        this.idEnd = idEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
-    * @param idIncrement
-    */
+     * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
+     * @param idIncrement
+     */
     public SiteBusinessQuery idIncrement(Long idIncrement){
-		this.idIncrement = idIncrement;
-		return this;
+        this.idIncrement = idIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
-    * @param idList
-    */
+     * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+     * @param idList
+     */
     public SiteBusinessQuery idList(List<Long> idList){
         this.idList = idList;
-		return this;
-        }
+        return this;
+    }
 
     /**
-    * 璁剧疆  绔欑偣ID
-    * @param siteId
-    */
+     * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+     * @param idNotList
+     */
+    public SiteBusinessQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+    }
+
+    /**
+     * 璁剧疆  绔欑偣ID
+     * @param siteId
+     */
     public SiteBusinessQuery siteId(Long siteId){
-	    setSiteId(siteId);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 绔欑偣ID
-    * @param siteIdStart
-    */
+        setSiteId(siteId);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 绔欑偣ID
+     * @param siteIdStart
+     */
     public SiteBusinessQuery siteIdStart(Long siteIdStart){
-		this.siteIdStart = siteIdStart;
-		return this;
+        this.siteIdStart = siteIdStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 绔欑偣ID
-    * @param siteIdEnd
-    */
+     * 璁剧疆 缁撴潫 绔欑偣ID
+     * @param siteIdEnd
+     */
     public SiteBusinessQuery siteIdEnd(Long siteIdEnd){
-		this.siteIdEnd = siteIdEnd;
-		return this;
+        this.siteIdEnd = siteIdEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 绔欑偣ID
-    * @param siteIdIncrement
-    */
+     * 璁剧疆 澧炲姞 绔欑偣ID
+     * @param siteIdIncrement
+     */
     public SiteBusinessQuery siteIdIncrement(Long siteIdIncrement){
-		this.siteIdIncrement = siteIdIncrement;
-		return this;
+        this.siteIdIncrement = siteIdIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 绔欑偣ID
-    * @param siteIdList
-    */
+     * 璁剧疆 绔欑偣ID
+     * @param siteIdList
+     */
     public SiteBusinessQuery siteIdList(List<Long> siteIdList){
         this.siteIdList = siteIdList;
-		return this;
-        }
+        return this;
+    }
+
+    /**
+     * 璁剧疆 绔欑偣ID
+     * @param siteIdNotList
+     */
+    public SiteBusinessQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+    }
 
 
-	/**
-    * 璁剧疆 绔欑偣鍚嶇О
-    * @param siteName
-    */
+    /**
+     * 璁剧疆 绔欑偣鍚嶇О
+     * @param siteName
+     */
     public SiteBusinessQuery siteName(String siteName){
         setSiteName(siteName);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 绔欑偣鍚嶇О
-    * @param siteNameList
-    */
+     * 璁剧疆 绔欑偣鍚嶇О
+     * @param siteNameList
+     */
     public SiteBusinessQuery siteNameList(List<String> siteNameList){
         this.siteNameList = siteNameList;
-		return this;
+        return this;
     }
 
-    /**
-    * 璁剧疆  涓氬姟ID
-    * @param businessId
-    */
-    public SiteBusinessQuery businessId(Long businessId){
-	    setBusinessId(businessId);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 涓氬姟ID
-    * @param businessIdStart
-    */
-    public SiteBusinessQuery businessIdStart(Long businessIdStart){
-		this.businessIdStart = businessIdStart;
-		return this;
-    }
 
     /**
-    * 璁剧疆 缁撴潫 涓氬姟ID
-    * @param businessIdEnd
-    */
-    public SiteBusinessQuery businessIdEnd(Long businessIdEnd){
-		this.businessIdEnd = businessIdEnd;
-		return this;
+     * 璁剧疆 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
+     * @param ancestors
+     */
+    public SiteBusinessQuery ancestors(String ancestors){
+        setAncestors(ancestors);
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 涓氬姟ID
-    * @param businessIdIncrement
-    */
-    public SiteBusinessQuery businessIdIncrement(Long businessIdIncrement){
-		this.businessIdIncrement = businessIdIncrement;
-		return this;
+     * 璁剧疆 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
+     * @param ancestorsList
+     */
+    public SiteBusinessQuery ancestorsList(List<String> ancestorsList){
+        this.ancestorsList = ancestorsList;
+        return this;
     }
 
     /**
-    * 璁剧疆 涓氬姟ID
-    * @param businessIdList
-    */
-    public SiteBusinessQuery businessIdList(List<Long> businessIdList){
-        this.businessIdList = businessIdList;
-		return this;
-        }
-
-
-	/**
-    * 璁剧疆 涓氬姟鍚嶇О
-    * @param businessName
-    */
-    public SiteBusinessQuery businessName(String businessName){
-        setBusinessName(businessName);
-		return this;
+     * 璁剧疆  涓氬姟ID
+     * @param businessId
+     */
+    public SiteBusinessQuery businessId(Long businessId){
+        setBusinessId(businessId);
+        return this;
     }
 
     /**
-    * 璁剧疆 涓氬姟鍚嶇О
-    * @param businessNameList
-    */
-    public SiteBusinessQuery businessNameList(List<String> businessNameList){
-        this.businessNameList = businessNameList;
-		return this;
+     * 璁剧疆 寮€濮� 涓氬姟ID
+     * @param businessIdStart
+     */
+    public SiteBusinessQuery businessIdStart(Long businessIdStart){
+        this.businessIdStart = businessIdStart;
+        return this;
     }
 
-
     /**
-    * 璁剧疆  鍒涘缓鐢ㄦ埛
-    * @param createUserId
-    */
-    public SiteBusinessQuery createUserId(Long createUserId){
-	    setCreateUserId(createUserId);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
-    * @param createUserIdStart
-    */
-    public SiteBusinessQuery createUserIdStart(Long createUserIdStart){
-		this.createUserIdStart = createUserIdStart;
-		return this;
+     * 璁剧疆 缁撴潫 涓氬姟ID
+     * @param businessIdEnd
+     */
+    public SiteBusinessQuery businessIdEnd(Long businessIdEnd){
+        this.businessIdEnd = businessIdEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
-    * @param createUserIdEnd
-    */
-    public SiteBusinessQuery createUserIdEnd(Long createUserIdEnd){
-		this.createUserIdEnd = createUserIdEnd;
-		return this;
+     * 璁剧疆 澧炲姞 涓氬姟ID
+     * @param businessIdIncrement
+     */
+    public SiteBusinessQuery businessIdIncrement(Long businessIdIncrement){
+        this.businessIdIncrement = businessIdIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
-    * @param createUserIdIncrement
-    */
-    public SiteBusinessQuery createUserIdIncrement(Long createUserIdIncrement){
-		this.createUserIdIncrement = createUserIdIncrement;
-		return this;
+     * 璁剧疆 涓氬姟ID
+     * @param businessIdList
+     */
+    public SiteBusinessQuery businessIdList(List<Long> businessIdList){
+        this.businessIdList = businessIdList;
+        return this;
     }
 
     /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛
-    * @param createUserIdList
-    */
-    public SiteBusinessQuery createUserIdList(List<Long> createUserIdList){
-        this.createUserIdList = createUserIdList;
-		return this;
-        }
-
-
-
-	/**
-    * 璁剧疆 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
-    * @param ancestors
-    */
-    public SiteBusinessQuery ancestors(String ancestors){
-        setAncestors(ancestors);
-		return this;
+     * 璁剧疆 涓氬姟ID
+     * @param businessIdNotList
+     */
+    public SiteBusinessQuery businessIdNotList(List<Long> businessIdNotList){
+        this.businessIdNotList = businessIdNotList;
+        return this;
     }
 
     /**
-    * 璁剧疆 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
-    * @param ancestorsList
-    */
-    public SiteBusinessQuery ancestorsList(List<String> ancestorsList){
-        this.ancestorsList = ancestorsList;
-		return this;
+     * 璁剧疆  涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
+     * @param isBusiness
+     */
+    public SiteBusinessQuery isBusiness(Integer isBusiness){
+        setIsBusiness(isBusiness);
+        return this;
     }
 
     /**
-    * 璁剧疆  涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
-    * @param isBusiness
-    */
-    public SiteBusinessQuery isBusiness(Integer isBusiness){
-	    setIsBusiness(isBusiness);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
-    * @param isBusinessStart
-    */
+     * 璁剧疆 寮€濮� 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
+     * @param isBusinessStart
+     */
     public SiteBusinessQuery isBusinessStart(Integer isBusinessStart){
-		this.isBusinessStart = isBusinessStart;
-		return this;
+        this.isBusinessStart = isBusinessStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
-    * @param isBusinessEnd
-    */
+     * 璁剧疆 缁撴潫 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
+     * @param isBusinessEnd
+     */
     public SiteBusinessQuery isBusinessEnd(Integer isBusinessEnd){
-		this.isBusinessEnd = isBusinessEnd;
-		return this;
+        this.isBusinessEnd = isBusinessEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
-    * @param isBusinessIncrement
-    */
+     * 璁剧疆 澧炲姞 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
+     * @param isBusinessIncrement
+     */
     public SiteBusinessQuery isBusinessIncrement(Integer isBusinessIncrement){
-		this.isBusinessIncrement = isBusinessIncrement;
-		return this;
+        this.isBusinessIncrement = isBusinessIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
-    * @param isBusinessList
-    */
+     * 璁剧疆 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
+     * @param isBusinessList
+     */
     public SiteBusinessQuery isBusinessList(List<Integer> isBusinessList){
         this.isBusinessList = isBusinessList;
-		return this;
-        }
+        return this;
+    }
 
     /**
-    * 璁剧疆  涓氬姟鐖剁骇ID
-    * @param parentId
-    */
+     * 璁剧疆 涓氬姟绫诲瀷(0.涓€绾т笟鍔�,1.浜岀骇涓氬姟)
+     * @param isBusinessNotList
+     */
+    public SiteBusinessQuery isBusinessNotList(List<Integer> isBusinessNotList){
+        this.isBusinessNotList = isBusinessNotList;
+        return this;
+    }
+
+    /**
+     * 璁剧疆  涓氬姟鐖剁骇ID
+     * @param parentId
+     */
     public SiteBusinessQuery parentId(Long parentId){
-	    setParentId(parentId);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 涓氬姟鐖剁骇ID
-    * @param parentIdStart
-    */
+        setParentId(parentId);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 涓氬姟鐖剁骇ID
+     * @param parentIdStart
+     */
     public SiteBusinessQuery parentIdStart(Long parentIdStart){
-		this.parentIdStart = parentIdStart;
-		return this;
+        this.parentIdStart = parentIdStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 涓氬姟鐖剁骇ID
-    * @param parentIdEnd
-    */
+     * 璁剧疆 缁撴潫 涓氬姟鐖剁骇ID
+     * @param parentIdEnd
+     */
     public SiteBusinessQuery parentIdEnd(Long parentIdEnd){
-		this.parentIdEnd = parentIdEnd;
-		return this;
+        this.parentIdEnd = parentIdEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 涓氬姟鐖剁骇ID
-    * @param parentIdIncrement
-    */
+     * 璁剧疆 澧炲姞 涓氬姟鐖剁骇ID
+     * @param parentIdIncrement
+     */
     public SiteBusinessQuery parentIdIncrement(Long parentIdIncrement){
-		this.parentIdIncrement = parentIdIncrement;
-		return this;
+        this.parentIdIncrement = parentIdIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 涓氬姟鐖剁骇ID
-    * @param parentIdList
-    */
+     * 璁剧疆 涓氬姟鐖剁骇ID
+     * @param parentIdList
+     */
     public SiteBusinessQuery parentIdList(List<Long> parentIdList){
         this.parentIdList = parentIdList;
-		return this;
-        }
+        return this;
+    }
 
     /**
-    * 璁剧疆  涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
-    * @param status
-    */
+     * 璁剧疆 涓氬姟鐖剁骇ID
+     * @param parentIdNotList
+     */
+    public SiteBusinessQuery parentIdNotList(List<Long> parentIdNotList){
+        this.parentIdNotList = parentIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 璁剧疆 涓氬姟鍚嶇О
+     * @param businessName
+     */
+    public SiteBusinessQuery businessName(String businessName){
+        setBusinessName(businessName);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 涓氬姟鍚嶇О
+     * @param businessNameList
+     */
+    public SiteBusinessQuery businessNameList(List<String> businessNameList){
+        this.businessNameList = businessNameList;
+        return this;
+    }
+
+    /**
+     * 璁剧疆  涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+     * @param status
+     */
     public SiteBusinessQuery status(Integer status){
-	    setStatus(status);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
-    * @param statusStart
-    */
+        setStatus(status);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+     * @param statusStart
+     */
     public SiteBusinessQuery statusStart(Integer statusStart){
-		this.statusStart = statusStart;
-		return this;
+        this.statusStart = statusStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
-    * @param statusEnd
-    */
+     * 璁剧疆 缁撴潫 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+     * @param statusEnd
+     */
     public SiteBusinessQuery statusEnd(Integer statusEnd){
-		this.statusEnd = statusEnd;
-		return this;
+        this.statusEnd = statusEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
-    * @param statusIncrement
-    */
+     * 璁剧疆 澧炲姞 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+     * @param statusIncrement
+     */
     public SiteBusinessQuery statusIncrement(Integer statusIncrement){
-		this.statusIncrement = statusIncrement;
-		return this;
+        this.statusIncrement = statusIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
-    * @param statusList
-    */
+     * 璁剧疆 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+     * @param statusList
+     */
     public SiteBusinessQuery statusList(List<Integer> statusList){
         this.statusList = statusList;
-		return this;
-        }
+        return this;
+    }
+
+    /**
+     * 璁剧疆 涓氬姟鐘舵€� (0.鍋滅敤锛�1.姝ｅ父)
+     * @param statusNotList
+     */
+    public SiteBusinessQuery statusNotList(List<Integer> statusNotList){
+        this.statusNotList = statusNotList;
+        return this;
+    }
+
+
+    /**
+     * 璁剧疆  鍒涘缓鐢ㄦ埛
+     * @param createUserId
+     */
+    public SiteBusinessQuery createUserId(Long createUserId){
+        setCreateUserId(createUserId);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
+     * @param createUserIdStart
+     */
+    public SiteBusinessQuery createUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+        return this;
+    }
+
+    /**
+     * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
+     * @param createUserIdEnd
+     */
+    public SiteBusinessQuery createUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+        return this;
+    }
+
+    /**
+     * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
+     * @param createUserIdIncrement
+     */
+    public SiteBusinessQuery createUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+        return this;
+    }
+
+    /**
+     * 璁剧疆 鍒涘缓鐢ㄦ埛
+     * @param createUserIdList
+     */
+    public SiteBusinessQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+        return this;
+    }
+
+    /**
+     * 璁剧疆 鍒涘缓鐢ㄦ埛
+     * @param createUserIdNotList
+     */
+    public SiteBusinessQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+    }
+
 
     /**
-    * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @return orConditionList
-    */
+     * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @return orConditionList
+     */
     public List<SiteBusinessQuery> getOrConditionList(){
-    return this.orConditionList;
+        return this.orConditionList;
     }
 
     /**
-    * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @param orConditionList
-    */
+     * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @param orConditionList
+     */
     public void setOrConditionList(List<SiteBusinessQuery> orConditionList){
         this.orConditionList = orConditionList;
     }
 
     /**
-    * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @return andConditionList
-    */
+     * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @return andConditionList
+     */
     public List<SiteBusinessQuery> getAndConditionList(){
         return this.andConditionList;
     }
 
     /**
-    * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @param andConditionList
-    */
+     * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @param andConditionList
+     */
     public void setAndConditionList(List<SiteBusinessQuery> andConditionList){
         this.andConditionList = andConditionList;
     }
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/site/model/vo/SiteBusinessVo.java b/base-manager/src/main/java/com/mortals/xhx/module/site/model/vo/SiteBusinessVo.java
index 7d6e776f3149cf3c813f9882ea28289296d1373f..3c0fff03578f6d12fac300549aefecce6b7ba43b 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/site/model/vo/SiteBusinessVo.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/site/model/vo/SiteBusinessVo.java
@@ -51,5 +51,6 @@ public class SiteBusinessVo extends BaseEntityLong {
     private Integer businessType;
 
 
+    private List<Long> idNotList;
 
 }
\ No newline at end of file
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteThemeMatterServiceImpl.java b/base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteThemeMatterServiceImpl.java
index 065644e67d164bd07225b7ad4caff8f425df5d77..80b7291c18010e149554f34783b9339cc933602e 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteThemeMatterServiceImpl.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteThemeMatterServiceImpl.java
@@ -105,7 +105,7 @@ public class SiteThemeMatterServiceImpl extends AbstractCRUDServiceImpl<SiteThem
                 siteMatterQuery.setSiteId(siteId);
                 siteMatterQuery.setMatterCodeList(matterCodeList);
                 List<SiteMatterEntity> siteMatterEntities = siteMatterService.find(siteMatterQuery, context);
-                log.info(String.format("size1:%s,size2:%s", allList.size(), siteMatterEntities.size()));
+                log.info(String.format("鎶撳彇鏁伴噺:%s,鏈湴鏁伴噺:%s", allList.size(), siteMatterEntities.size()));
                 if (!ObjectUtils.isEmpty(siteMatterEntities)) {
                     List<SiteThemeMatterEntity> collect = siteMatterEntities.stream().map(siteMatterEntity -> {
                         SiteThemeMatterEntity siteThemeMatterEntity = new SiteThemeMatterEntity();
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/workman/service/WorkmanService.java b/base-manager/src/main/java/com/mortals/xhx/module/workman/service/WorkmanService.java
index 2594c666a9821f342feeb972124c5bb6cf763cbf..ed5f3fd68eac1400a2a1f0129d359106d2a22741 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/workman/service/WorkmanService.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/workman/service/WorkmanService.java
@@ -40,6 +40,8 @@ public interface WorkmanService extends ICRUDCacheService<WorkmanEntity,Long> {
      */
     boolean updateUserPwd(String loginName, String oldPwd, String newPwd) throws AppException;
 
+    boolean updateUserPwd(String loginName, String newPwd) throws AppException;
+
 
 
 
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java b/base-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java
index 6fa735523c27b8427bde5d78e8c9f850a3e4807a..654bbf925d6514925035075f0a2cf8768a6e89b2 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java
@@ -61,8 +61,8 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
         if (StringUtils.isNull(entity.getLoginPwd())) {
             throw new AppException("瀵嗙爜涓嶈兘涓虹┖锛�");
         }
-        int count = this.count(new WorkmanQuery().loginName(entity.getLoginName()),context);
-        if (count>0) {
+        int count = this.count(new WorkmanQuery().loginName(entity.getLoginName()), context);
+        if (count > 0) {
             throw new AppException("璐﹀彿宸插瓨鍦紒");
         }
 
@@ -123,13 +123,34 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
         if (sysUser == null || !sysUser.getLoginName().equals(loginName)) {
             throw new AppException("甯愬彿閿欒锛�");
         }
-//        try {
-//            if (!sysUser.getLoginPwd().equals(SecurityUtil.md5DoubleEncoding(oldPwd))) {
-//                throw new AppException("鍘熷瀵嗙爜閿欒锛�");
-//            }
-//        } catch (Exception e) {
-//            throw new AppException("瀵嗙爜楠岃鍑洪敊锛�", e);
-//        }
+        try {
+            if (!sysUser.getLoginPwd().equals(SecurityUtil.md5DoubleEncoding(oldPwd))) {
+                throw new AppException("鍘熷瀵嗙爜閿欒锛�");
+            }
+        } catch (Exception e) {
+            throw new AppException("瀵嗙爜楠岃鍑洪敊锛�", e);
+        }
+        try {
+            sysUser.setLoginPwd(SecurityUtil.md5DoubleEncoding(newPwd));
+        } catch (Exception e) {
+            throw new AppException("瀵嗙爜杞崲寮傚父锛�", e);
+        }
+        dao.update(sysUser);
+        return true;
+    }
+
+    /**
+     * @param loginName
+     * @param newPwd
+     * @return
+     * @throws AppException
+     */
+    @Override
+    public boolean updateUserPwd(String loginName, String newPwd) throws AppException {
+        WorkmanEntity sysUser = this.selectOne(new WorkmanQuery().loginName(loginName));
+        if (sysUser == null || !sysUser.getLoginName().equals(loginName)) {
+            throw new AppException("甯愬彿閿欒锛�");
+        }
         try {
             sysUser.setLoginPwd(SecurityUtil.md5DoubleEncoding(newPwd));
         } catch (Exception e) {
@@ -152,11 +173,11 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
             throw new AppException("鏂囦欢涓嶅瓨鍦紒");
         }
         //瑙ｅ帇鍥剧墖
-        String fileEncode ="UTF-8";
+        String fileEncode = "UTF-8";
         try {
-            fileEncode = EncodeUtil.getEncode(targetFilePath,true);
+            fileEncode = EncodeUtil.getEncode(targetFilePath, true);
         } catch (Exception e) {
-            log.error("寮傚父",e);
+            log.error("寮傚父", e);
         }
         ZipUtil.unzip(targetFilePath, disPath, Charset.forName(fileEncode));
         //璇诲彇鐩綍涓嬬殑鎵€鏈夊浘鐗�
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java b/base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java
index 7cc7e0a53a376220952fbe0b36e1aaf3c0483441..ff952e960944d1e2b7337cf0c11ada70d9cea55d 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java
@@ -133,6 +133,27 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
     @RequestMapping(value = "change/password", method = RequestMethod.POST)
     @UnAuth
     public String changePassword(@RequestBody WorkmanEntity query) {
+        JSONObject ret = new JSONObject();
+        try {
+            boolean bool = service.updateUserPwd(query.getLoginName(), query.getNewPwd());
+            if (bool) {
+                ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+                ret.put(KEY_RESULT_MSG, "瀵嗙爜淇敼鎴愬姛锛�");
+            } else {
+                throw new AppException("璐︽埛瀵嗙爜淇敼澶辫触锛�");
+            }
+
+        } catch (Exception e) {
+            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+            ret.put(KEY_RESULT_MSG, super.convertException(e));
+        }
+        return ret.toJSONString();
+    }
+
+
+    @RequestMapping(value = "person/change/password", method = RequestMethod.POST)
+    @UnAuth
+    public String personChangePassword(@RequestBody WorkmanEntity query) {
         JSONObject ret = new JSONObject();
         try {
             boolean bool = service.updateUserPwd(query.getLoginName(), query.getOldPwd(), query.getNewPwd());
@@ -188,8 +209,8 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
                 workmanEntity.setLoginName(loginName);
             }
 
-            log.info("loginPwd:"+workmanEntity.getLoginPwd());
-            if (ObjectUtils.isEmpty(workmanEntity.getLoginPwd())||"".equals(workmanEntity.getLoginPwd().trim())) {
+            log.info("loginPwd:" + workmanEntity.getLoginPwd());
+            if (ObjectUtils.isEmpty(workmanEntity.getLoginPwd()) || "".equals(workmanEntity.getLoginPwd().trim())) {
                 workmanEntity.setLoginPwd("123");
             }
 
diff --git a/base-manager/src/main/resources/sqlmap/module/site/SiteBusinessMapper.xml b/base-manager/src/main/resources/sqlmap/module/site/SiteBusinessMapper.xml
index bd9317b65451d3de11e4d7967fe72f81372199f1..f3abbfe86c9d330560eecdab861e0d8cb2fac55f 100644
--- a/base-manager/src/main/resources/sqlmap/module/site/SiteBusinessMapper.xml
+++ b/base-manager/src/main/resources/sqlmap/module/site/SiteBusinessMapper.xml
@@ -1,82 +1,82 @@
 <?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.site.dao.ibatis.SiteBusinessDaoImpl">
 
     <!-- 瀛楁鍜屽睘鎬ф槧灏� -->
     <resultMap type="SiteBusinessEntity" id="SiteBusinessEntity-Map">
-            <id  property="id" column="id" />
-            <result property="siteId" column="siteId" />
-            <result property="siteName" column="siteName" />
-            <result property="businessId" column="businessId" />
-            <result property="businessName" column="businessName" />
-            <result property="createTime" column="createTime" />
-            <result property="createUserId" column="createUserId" />
-            <result property="updateTime" column="updateTime" />
-            <result property="ancestors" column="ancestors" />
-            <result property="isBusiness" column="isBusiness" />
-            <result property="parentId" column="parentId" />
-            <result property="status" column="status" />
-            
+        <id  property="id" column="id" />
+        <result property="siteId" column="siteId" />
+        <result property="siteName" column="siteName" />
+        <result property="ancestors" column="ancestors" />
+        <result property="businessId" column="businessId" />
+        <result property="isBusiness" column="isBusiness" />
+        <result property="parentId" column="parentId" />
+        <result property="businessName" column="businessName" />
+        <result property="status" column="status" />
+        <result property="createTime" column="createTime" />
+        <result property="createUserId" column="createUserId" />
+        <result property="updateTime" column="updateTime" />
+
     </resultMap>
 
 
     <!-- 琛ㄦ墍鏈夊垪 -->
     <sql id="_columns">
         <trim suffixOverrides="," suffix="">
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
-                    a.id as id,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
-                    a.siteId as siteId,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
-                    a.siteName as siteName,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('businessId') or colPickMode == 1 and data.containsKey('businessId')))">
-                    a.businessId as businessId,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('businessName') or colPickMode == 1 and data.containsKey('businessName')))">
-                    a.businessName as businessName,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
-                    a.createTime as createTime,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
-                    a.createUserId as createUserId,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
-                    a.updateTime as updateTime,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ancestors') or colPickMode == 1 and data.containsKey('ancestors')))">
-                    a.ancestors as ancestors,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isBusiness') or colPickMode == 1 and data.containsKey('isBusiness')))">
-                    a.isBusiness as isBusiness,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('parentId') or colPickMode == 1 and data.containsKey('parentId')))">
-                    a.parentId as parentId,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
-                    a.status as status,
-                </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                a.id,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+                a.siteId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
+                a.siteName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ancestors') or colPickMode == 1 and data.containsKey('ancestors')))">
+                a.ancestors,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('businessId') or colPickMode == 1 and data.containsKey('businessId')))">
+                a.businessId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isBusiness') or colPickMode == 1 and data.containsKey('isBusiness')))">
+                a.isBusiness,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('parentId') or colPickMode == 1 and data.containsKey('parentId')))">
+                a.parentId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('businessName') or colPickMode == 1 and data.containsKey('businessName')))">
+                a.businessName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
+                a.status,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                a.createTime,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                a.createUserId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                a.updateTime,
+            </if>
         </trim>
     </sql>
     <!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
     <insert id="insert" parameterType="SiteBusinessEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_sys_site_business
-        (siteId,siteName,businessId,businessName,createTime,createUserId,updateTime,ancestors,isBusiness,parentId,status)
+        (siteId,siteName,ancestors,businessId,isBusiness,parentId,businessName,status,createTime,createUserId,updateTime)
         VALUES
-        (#{siteId},#{siteName},#{businessId},#{businessName},#{createTime},#{createUserId},#{updateTime},#{ancestors},#{isBusiness},#{parentId},#{status})
+        (#{siteId},#{siteName},#{ancestors},#{businessId},#{isBusiness},#{parentId},#{businessName},#{status},#{createTime},#{createUserId},#{updateTime})
     </insert>
 
     <!-- 鎵归噺鏂板 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_sys_site_business
-        (siteId,siteName,businessId,businessName,createTime,createUserId,updateTime,ancestors,isBusiness,parentId,status)
+        (siteId,siteName,ancestors,businessId,isBusiness,parentId,businessName,status,createTime,createUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.siteName},#{item.businessId},#{item.businessName},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.ancestors},#{item.isBusiness},#{item.parentId},#{item.status})
+            (#{item.siteId},#{item.siteName},#{item.ancestors},#{item.businessId},#{item.isBusiness},#{item.parentId},#{item.businessName},#{item.status},#{item.createTime},#{item.createUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -95,30 +95,15 @@
             <if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
                 a.siteName=#{data.siteName},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('ancestors')) or (colPickMode==1 and !data.containsKey('ancestors'))">
+                a.ancestors=#{data.ancestors},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('businessId')) or (colPickMode==1 and !data.containsKey('businessId'))">
                 a.businessId=#{data.businessId},
             </if>
             <if test="(colPickMode==0 and data.containsKey('businessIdIncrement')) or (colPickMode==1 and !data.containsKey('businessIdIncrement'))">
                 a.businessId=ifnull(a.businessId,0) + #{data.businessIdIncrement},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('businessName')) or (colPickMode==1 and !data.containsKey('businessName'))">
-                a.businessName=#{data.businessName},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
-                a.createTime=#{data.createTime},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
-                a.createUserId=#{data.createUserId},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
-                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
-                a.updateTime=#{data.updateTime},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('ancestors')) or (colPickMode==1 and !data.containsKey('ancestors'))">
-                a.ancestors=#{data.ancestors},
-            </if>
             <if test="(colPickMode==0 and data.containsKey('isBusiness')) or (colPickMode==1 and !data.containsKey('isBusiness'))">
                 a.isBusiness=#{data.isBusiness},
             </if>
@@ -131,12 +116,27 @@
             <if test="(colPickMode==0 and data.containsKey('parentIdIncrement')) or (colPickMode==1 and !data.containsKey('parentIdIncrement'))">
                 a.parentId=ifnull(a.parentId,0) + #{data.parentIdIncrement},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('businessName')) or (colPickMode==1 and !data.containsKey('businessName'))">
+                a.businessName=#{data.businessName},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('status')) or (colPickMode==1 and !data.containsKey('status'))">
                 a.status=#{data.status},
             </if>
             <if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))">
                 a.status=ifnull(a.status,0) + #{data.statusIncrement},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.createUserId=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.updateTime=#{data.updateTime},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -149,113 +149,113 @@
     <update id="updateBatch" parameterType="paramDto">
         update mortals_sys_site_business as a
         <trim prefix="set" suffixOverrides=",">
-                        <trim prefix="siteId=(case" suffix="ELSE siteId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
-                                        when a.id=#{item.id} then #{item.siteId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="siteName=(case" suffix="ELSE siteName end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
-                            when a.id=#{item.id} then #{item.siteName}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="businessId=(case" suffix="ELSE businessId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('businessId')) or (colPickMode==1 and !item.containsKey('businessId'))">
-                                        when a.id=#{item.id} then #{item.businessId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('businessIdIncrement')) or (colPickMode==1 and !item.containsKey('businessIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.businessId,0) + #{item.businessIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="businessName=(case" suffix="ELSE businessName end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('businessName')) or (colPickMode==1 and !item.containsKey('businessName'))">
-                            when a.id=#{item.id} then #{item.businessName}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
-                            when a.id=#{item.id} then #{item.createTime}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
-                                        when a.id=#{item.id} then #{item.createUserId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
-                            when a.id=#{item.id} then #{item.updateTime}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="ancestors=(case" suffix="ELSE ancestors end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('ancestors')) or (colPickMode==1 and !item.containsKey('ancestors'))">
-                            when a.id=#{item.id} then #{item.ancestors}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="isBusiness=(case" suffix="ELSE isBusiness end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('isBusiness')) or (colPickMode==1 and !item.containsKey('isBusiness'))">
-                                        when a.id=#{item.id} then #{item.isBusiness}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('isBusinessIncrement')) or (colPickMode==1 and !item.containsKey('isBusinessIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.isBusiness,0) + #{item.isBusinessIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                        <trim prefix="parentId=(case" suffix="ELSE parentId end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('parentId')) or (colPickMode==1 and !item.containsKey('parentId'))">
-                                        when a.id=#{item.id} then #{item.parentId}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('parentIdIncrement')) or (colPickMode==1 and !item.containsKey('parentIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.parentId,0) + #{item.parentIdIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                        <trim prefix="status=(case" suffix="ELSE status end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('status')) or (colPickMode==1 and !item.containsKey('status'))">
-                                        when a.id=#{item.id} then #{item.status}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('statusIncrement')) or (colPickMode==1 and !item.containsKey('statusIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.status,0) + #{item.statusIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
+            <trim prefix="siteId=(case" suffix="ELSE siteId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
+                            when a.id=#{item.id} then #{item.siteId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="siteName=(case" suffix="ELSE siteName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
+                        when a.id=#{item.id} then #{item.siteName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="ancestors=(case" suffix="ELSE ancestors end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('ancestors')) or (colPickMode==1 and !item.containsKey('ancestors'))">
+                        when a.id=#{item.id} then #{item.ancestors}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="businessId=(case" suffix="ELSE businessId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('businessId')) or (colPickMode==1 and !item.containsKey('businessId'))">
+                            when a.id=#{item.id} then #{item.businessId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('businessIdIncrement')) or (colPickMode==1 and !item.containsKey('businessIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.businessId,0) + #{item.businessIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="isBusiness=(case" suffix="ELSE isBusiness end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('isBusiness')) or (colPickMode==1 and !item.containsKey('isBusiness'))">
+                            when a.id=#{item.id} then #{item.isBusiness}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('isBusinessIncrement')) or (colPickMode==1 and !item.containsKey('isBusinessIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.isBusiness,0) + #{item.isBusinessIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="parentId=(case" suffix="ELSE parentId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('parentId')) or (colPickMode==1 and !item.containsKey('parentId'))">
+                            when a.id=#{item.id} then #{item.parentId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('parentIdIncrement')) or (colPickMode==1 and !item.containsKey('parentIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.parentId,0) + #{item.parentIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="businessName=(case" suffix="ELSE businessName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('businessName')) or (colPickMode==1 and !item.containsKey('businessName'))">
+                        when a.id=#{item.id} then #{item.businessName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="status=(case" suffix="ELSE status end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('status')) or (colPickMode==1 and !item.containsKey('status'))">
+                            when a.id=#{item.id} then #{item.status}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('statusIncrement')) or (colPickMode==1 and !item.containsKey('statusIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.status,0) + #{item.statusIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                        when a.id=#{item.id} then #{item.createTime}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                            when a.id=#{item.id} then #{item.createUserId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                        when a.id=#{item.id} then #{item.updateTime}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -279,6 +279,21 @@
             #{item}
         </foreach>
     </delete>
+    <!-- 鏍规嵁涓诲仴鍒楄〃鍒犻櫎涓€鎵癸紝閽堝鍗曚竴涓诲仴鏈夋晥 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_sys_site_business where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 鏍规嵁瀵硅薄鍒楄〃鍒犻櫎涓€鎵癸紝閽堝鍗曚竴涓诲仴鏈夋晥 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_sys_site_business where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </delete>
     <!-- 鏍规嵁paramDto鍒犻櫎涓€鎵� -->
     <delete id="deleteByMap" parameterType="paramDto">
         delete a.* from mortals_sys_site_business as a
@@ -303,10 +318,6 @@
     </select>
 
 
-    <!-- 鑾峰彇瀛愯妭鐐� -->
-    <select id="selectChildrenSiteBusinessById" parameterType="String" resultMap="SiteBusinessEntity-Map">
-        select * from mortals_sys_site_business as a where find_in_set(#{siteBusinessId}, ancestors)
-    </select>
 
     <!-- 鑾峰彇 -->
     <select id="getListCount" parameterType="paramDto" resultType="int">
@@ -361,301 +372,343 @@
                 ${_conditionType_} a.id=#{${_conditionParam_}.id}
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('id')">
-                <if test="conditionParamRef.id != null ">
-                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
-                </if>
-                <if test="conditionParamRef.id == null">
-                    ${_conditionType_} a.id is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('idList')">
-                ${_conditionType_} a.id in
-                <foreach collection="conditionParamRef.idList" 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 test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null ">
+                ${_conditionType_} a.id = #{${_conditionParam_}.id}
             </if>
-            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
-                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            <if test="conditionParamRef.id == null">
+                ${_conditionType_} a.id is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('idList')">
+            ${_conditionType_} a.id in
+            <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('idNotList')">
+            ${_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>
+        <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+            ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('siteId')">
-                <if test="conditionParamRef.siteId != null ">
-                    ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
-                </if>
-                <if test="conditionParamRef.siteId == null">
-                    ${_conditionType_} a.siteId is null
-                </if>
+        <if test="conditionParamRef.containsKey('siteId')">
+            <if test="conditionParamRef.siteId != null ">
+                ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
             </if>
-            <if test="conditionParamRef.containsKey('siteIdList')">
-                ${_conditionType_} a.siteId in
-                <foreach collection="conditionParamRef.siteIdList" 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>
-            <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
-                ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+            <if test="conditionParamRef.siteId == null">
+                ${_conditionType_} a.siteId is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdList')">
+            ${_conditionType_} a.siteId in
+            <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdNotList')">
+            ${_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>
+        <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+            ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+        </if>
 
 
-            <if test="conditionParamRef.containsKey('siteName')">
-                <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
-                    ${_conditionType_} a.siteName like #{${_conditionParam_}.siteName}
-                </if>
-                <if test="conditionParamRef.siteName == null">
-                    ${_conditionType_} a.siteName is null
-                </if>
+        <if test="conditionParamRef.containsKey('siteName')">
+            <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
+                ${_conditionType_} a.siteName like #{${_conditionParam_}.siteName}
             </if>
-            <if test="conditionParamRef.containsKey('siteNameList')">
-                ${_conditionType_} a.siteName in
-                <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.siteName == null">
+                ${_conditionType_} a.siteName is null
             </if>
-            <if test="conditionParamRef.containsKey('businessId')">
-                <if test="conditionParamRef.businessId != null ">
-                    ${_conditionType_} a.businessId = #{${_conditionParam_}.businessId}
-                </if>
-                <if test="conditionParamRef.businessId == null">
-                    ${_conditionType_} a.businessId is null
-                </if>
+        </if>
+        <if test="conditionParamRef.containsKey('siteNameList')">
+            ${_conditionType_} a.siteName in
+            <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('ancestors')">
+            <if test="conditionParamRef.ancestors != null and conditionParamRef.ancestors != ''">
+                ${_conditionType_} a.ancestors like #{${_conditionParam_}.ancestors}
             </if>
-            <if test="conditionParamRef.containsKey('businessIdList')">
-                ${_conditionType_} a.businessId in
-                <foreach collection="conditionParamRef.businessIdList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.ancestors == null">
+                ${_conditionType_} a.ancestors is null
             </if>
-            <if test="conditionParamRef.containsKey('businessIdStart') and conditionParamRef.businessIdStart != null">
-                ${_conditionType_} a.businessId <![CDATA[ >= ]]> #{${_conditionParam_}.businessIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('ancestorsList')">
+            ${_conditionType_} a.ancestors in
+            <foreach collection="conditionParamRef.ancestorsList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('businessId')">
+            <if test="conditionParamRef.businessId != null ">
+                ${_conditionType_} a.businessId = #{${_conditionParam_}.businessId}
             </if>
-            <if test="conditionParamRef.containsKey('businessIdEnd') and conditionParamRef.businessIdEnd != null">
-                ${_conditionType_} a.businessId <![CDATA[ <= ]]> #{${_conditionParam_}.businessIdEnd}
+            <if test="conditionParamRef.businessId == null">
+                ${_conditionType_} a.businessId is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('businessIdList')">
+            ${_conditionType_} a.businessId in
+            <foreach collection="conditionParamRef.businessIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('businessIdNotList')">
+            ${_conditionType_} a.businessId not in
+            <foreach collection="conditionParamRef.businessIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('businessIdStart') and conditionParamRef.businessIdStart != null">
+            ${_conditionType_} a.businessId <![CDATA[ >= ]]> #{${_conditionParam_}.businessIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('businessIdEnd') and conditionParamRef.businessIdEnd != null">
+            ${_conditionType_} a.businessId <![CDATA[ <= ]]> #{${_conditionParam_}.businessIdEnd}
+        </if>
 
-
-            <if test="conditionParamRef.containsKey('businessName')">
-                <if test="conditionParamRef.businessName != null and conditionParamRef.businessName != ''">
-                    ${_conditionType_} a.businessName like #{${_conditionParam_}.businessName}
-                </if>
-                <if test="conditionParamRef.businessName == null">
-                    ${_conditionType_} a.businessName is null
-                </if>
+        <if test="conditionParamRef.containsKey('isBusiness')">
+            <if test="conditionParamRef.isBusiness != null ">
+                ${_conditionType_} a.isBusiness = #{${_conditionParam_}.isBusiness}
             </if>
-            <if test="conditionParamRef.containsKey('businessNameList')">
-                ${_conditionType_} a.businessName in
-                <foreach collection="conditionParamRef.businessNameList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.isBusiness == null">
+                ${_conditionType_} a.isBusiness is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('isBusinessList')">
+            ${_conditionType_} a.isBusiness in
+            <foreach collection="conditionParamRef.isBusinessList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('isBusinessNotList')">
+            ${_conditionType_} a.isBusiness not in
+            <foreach collection="conditionParamRef.isBusinessNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('isBusinessStart') and conditionParamRef.isBusinessStart != null">
+            ${_conditionType_} a.isBusiness <![CDATA[ >= ]]> #{${_conditionParam_}.isBusinessStart}
+        </if>
+        <if test="conditionParamRef.containsKey('isBusinessEnd') and conditionParamRef.isBusinessEnd != null">
+            ${_conditionType_} a.isBusiness <![CDATA[ <= ]]> #{${_conditionParam_}.isBusinessEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('createTime')">
-                <if test="conditionParamRef.createTime != null ">
-                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
-                </if>
-                <if test="conditionParamRef.createTime == null">
-                    ${_conditionType_} a.createTime is null
-                </if>
+        <if test="conditionParamRef.containsKey('parentId')">
+            <if test="conditionParamRef.parentId != null ">
+                ${_conditionType_} a.parentId = #{${_conditionParam_}.parentId}
             </if>
-            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
-                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
-            </if>
-            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
-                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
-            </if>
-            <if test="conditionParamRef.containsKey('createUserId')">
-                <if test="conditionParamRef.createUserId != null ">
-                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
-                </if>
-                <if test="conditionParamRef.createUserId == null">
-                    ${_conditionType_} a.createUserId is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('createUserIdList')">
-                ${_conditionType_} a.createUserId in
-                <foreach collection="conditionParamRef.createUserIdList" 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>
-            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
-                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            <if test="conditionParamRef.parentId == null">
+                ${_conditionType_} a.parentId is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('parentIdList')">
+            ${_conditionType_} a.parentId in
+            <foreach collection="conditionParamRef.parentIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('parentIdNotList')">
+            ${_conditionType_} a.parentId not in
+            <foreach collection="conditionParamRef.parentIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('parentIdStart') and conditionParamRef.parentIdStart != null">
+            ${_conditionType_} a.parentId <![CDATA[ >= ]]> #{${_conditionParam_}.parentIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('parentIdEnd') and conditionParamRef.parentIdEnd != null">
+            ${_conditionType_} a.parentId <![CDATA[ <= ]]> #{${_conditionParam_}.parentIdEnd}
+        </if>
 
 
-            <if test="conditionParamRef.containsKey('updateTime')">
-                <if test="conditionParamRef.updateTime != null ">
-                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
-                </if>
-                <if test="conditionParamRef.updateTime == null">
-                    ${_conditionType_} a.updateTime is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
-                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        <if test="conditionParamRef.containsKey('businessName')">
+            <if test="conditionParamRef.businessName != null and conditionParamRef.businessName != ''">
+                ${_conditionType_} a.businessName like #{${_conditionParam_}.businessName}
             </if>
-            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
-                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            <if test="conditionParamRef.businessName == null">
+                ${_conditionType_} a.businessName is null
             </if>
-
-            <if test="conditionParamRef.containsKey('ancestors')">
-                <if test="conditionParamRef.ancestors != null and conditionParamRef.ancestors != ''">
-                    ${_conditionType_} a.ancestors like #{${_conditionParam_}.ancestors}
-                </if>
-                <if test="conditionParamRef.ancestors == null">
-                    ${_conditionType_} a.ancestors is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('ancestorsList')">
-                ${_conditionType_} a.ancestors in
-                <foreach collection="conditionParamRef.ancestorsList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('isBusiness')">
-                <if test="conditionParamRef.isBusiness != null ">
-                    ${_conditionType_} a.isBusiness = #{${_conditionParam_}.isBusiness}
-                </if>
-                <if test="conditionParamRef.isBusiness == null">
-                    ${_conditionType_} a.isBusiness is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('isBusinessList')">
-                ${_conditionType_} a.isBusiness in
-                <foreach collection="conditionParamRef.isBusinessList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('isBusinessStart') and conditionParamRef.isBusinessStart != null">
-                ${_conditionType_} a.isBusiness <![CDATA[ >= ]]> #{${_conditionParam_}.isBusinessStart}
+        </if>
+        <if test="conditionParamRef.containsKey('businessNameList')">
+            ${_conditionType_} a.businessName in
+            <foreach collection="conditionParamRef.businessNameList" 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}
             </if>
-            <if test="conditionParamRef.containsKey('isBusinessEnd') and conditionParamRef.isBusinessEnd != null">
-                ${_conditionType_} a.isBusiness <![CDATA[ <= ]]> #{${_conditionParam_}.isBusinessEnd}
+            <if test="conditionParamRef.status == null">
+                ${_conditionType_} a.status is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('statusList')">
+            ${_conditionType_} a.status in
+            <foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('statusNotList')">
+            ${_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>
+        <if test="conditionParamRef.containsKey('statusEnd') and conditionParamRef.statusEnd != null">
+            ${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('parentId')">
-                <if test="conditionParamRef.parentId != null ">
-                    ${_conditionType_} a.parentId = #{${_conditionParam_}.parentId}
-                </if>
-                <if test="conditionParamRef.parentId == null">
-                    ${_conditionType_} a.parentId is null
-                </if>
+
+        <if test="conditionParamRef.containsKey('createTime')">
+            <if test="conditionParamRef.createTime != null ">
+                ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
             </if>
-            <if test="conditionParamRef.containsKey('parentIdList')">
-                ${_conditionType_} a.parentId in
-                <foreach collection="conditionParamRef.parentIdList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.createTime == null">
+                ${_conditionType_} a.createTime is null
             </if>
-            <if test="conditionParamRef.containsKey('parentIdStart') and conditionParamRef.parentIdStart != null">
-                ${_conditionType_} a.parentId <![CDATA[ >= ]]> #{${_conditionParam_}.parentIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+            ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+            ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('createUserId')">
+            <if test="conditionParamRef.createUserId != null ">
+                ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
             </if>
-            <if test="conditionParamRef.containsKey('parentIdEnd') and conditionParamRef.parentIdEnd != null">
-                ${_conditionType_} a.parentId <![CDATA[ <= ]]> #{${_conditionParam_}.parentIdEnd}
+            <if test="conditionParamRef.createUserId == null">
+                ${_conditionType_} a.createUserId is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('createUserIdList')">
+            ${_conditionType_} a.createUserId in
+            <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('createUserIdNotList')">
+            ${_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>
+        <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+            ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+        </if>
 
-            <if test="conditionParamRef.containsKey('status')">
-                <if test="conditionParamRef.status != null ">
-                    ${_conditionType_} a.status = #{${_conditionParam_}.status}
-                </if>
-                <if test="conditionParamRef.status == null">
-                    ${_conditionType_} a.status is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('statusList')">
-                ${_conditionType_} a.status in
-                <foreach collection="conditionParamRef.statusList" 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 test="conditionParamRef.containsKey('updateTime')">
+            <if test="conditionParamRef.updateTime != null ">
+                ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
             </if>
-            <if test="conditionParamRef.containsKey('statusEnd') and conditionParamRef.statusEnd != null">
-                ${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
+            <if test="conditionParamRef.updateTime == null">
+                ${_conditionType_} a.updateTime is null
             </if>
-
+        </if>
+        <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+            ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+            ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
             order by
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                     ${item.colName} ${item.sortKind}
+                    ${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
             <trim suffixOverrides=","  suffix="">
-                    <if test="orderCol.containsKey('id')">
-                        a.id
-                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('siteId')">
-                        a.siteId
-                        <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('siteName')">
-                        a.siteName
-                        <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('businessId')">
-                        a.businessId
-                        <if test='orderCol.businessId != null and "DESC".equalsIgnoreCase(orderCol.businessId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('businessName')">
-                        a.businessName
-                        <if test='orderCol.businessName != null and "DESC".equalsIgnoreCase(orderCol.businessName)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('createTime')">
-                        a.createTime
-                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('createUserId')">
-                        a.createUserId
-                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('updateTime')">
-                        a.updateTime
-                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('ancestors')">
-                        a.ancestors
-                        <if test='orderCol.ancestors != null and "DESC".equalsIgnoreCase(orderCol.ancestors)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('isBusiness')">
-                        a.isBusiness
-                        <if test='orderCol.isBusiness != null and "DESC".equalsIgnoreCase(orderCol.isBusiness)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('parentId')">
-                        a.parentId
-                        <if test='orderCol.parentId != null and "DESC".equalsIgnoreCase(orderCol.parentId)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('status')">
-                        a.status
-                        <if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
-                        ,
-                    </if>
+                <if test="orderCol.containsKey('id')">
+                    a.id
+                    <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('siteId')">
+                    a.siteId
+                    <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('siteName')">
+                    a.siteName
+                    <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('ancestors')">
+                    a.ancestors
+                    <if test='orderCol.ancestors != null and "DESC".equalsIgnoreCase(orderCol.ancestors)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('businessId')">
+                    a.businessId
+                    <if test='orderCol.businessId != null and "DESC".equalsIgnoreCase(orderCol.businessId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('isBusiness')">
+                    a.isBusiness
+                    <if test='orderCol.isBusiness != null and "DESC".equalsIgnoreCase(orderCol.isBusiness)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('parentId')">
+                    a.parentId
+                    <if test='orderCol.parentId != null and "DESC".equalsIgnoreCase(orderCol.parentId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('businessName')">
+                    a.businessName
+                    <if test='orderCol.businessName != null and "DESC".equalsIgnoreCase(orderCol.businessName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('status')">
+                    a.status
+                    <if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('createTime')">
+                    a.createTime
+                    <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('createUserId')">
+                    a.createUserId
+                    <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('updateTime')">
+                    a.updateTime
+                    <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>
diff --git a/base-manager/src/test/java/com/mortals/httpclient/site/SiteBusinessController.http b/base-manager/src/test/java/com/mortals/httpclient/site/SiteBusinessController.http
index c848f13f13c6504b41de03d6f54fac179a8c0a83..167aa4f2c4394f4f8ec4dbd36226ed79444db51d 100644
--- a/base-manager/src/test/java/com/mortals/httpclient/site/SiteBusinessController.http
+++ b/base-manager/src/test/java/com/mortals/httpclient/site/SiteBusinessController.http
@@ -1,10 +1,10 @@
 
 ###绔欑偣涓氬姟鍒楄〃
 POST {{baseUrl}}/site/business/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
+  "idNotList": [11,12],
   "siteId": 1,
     "page":1,
     "size":10
diff --git a/base-manager/src/test/java/com/mortals/httpclient/skin/SkinBaseController.http b/base-manager/src/test/java/com/mortals/httpclient/skin/SkinBaseController.http
index 65c20bb848347dc52939eb9742196b4db2502bbe..89b59144a3823a48df8b039fa27e4bba20b6b146 100644
--- a/base-manager/src/test/java/com/mortals/httpclient/skin/SkinBaseController.http
+++ b/base-manager/src/test/java/com/mortals/httpclient/skin/SkinBaseController.http
@@ -5,7 +5,7 @@ Content-Type: application/json
 
 {
   "page": 1,
-  "size": 10
+  "size": 100
 }
 
 
diff --git a/base-manager/src/test/java/com/mortals/httpclient/system/system.http b/base-manager/src/test/java/com/mortals/httpclient/system/system.http
index aa60b312a94274871d4169196f541dab8dd96e05..f7d211cc6617a6634015438236394bf3f18ad02f 100644
--- a/base-manager/src/test/java/com/mortals/httpclient/system/system.http
+++ b/base-manager/src/test/java/com/mortals/httpclient/system/system.http
@@ -45,8 +45,31 @@ Authorization: {{authToken}}
 GET {{baseUrl}}/sms/set/delete?id={{SmsSet_id}}
 Accept: application/json
 
+###test Gov
+POST {{baseUrl}}/test/testGov
+Content-Type: application/json
+
+{
+"url":"http://172.15.28.113:8900"
+}
+
+###test Cookie
+POST {{baseUrl}}/test/testCookie
+Content-Type: application/json
+
+{
+  "url":"http://172.15.28.113:8902"
+}
 
 
+###test Cookie
+POST {{baseUrl}}/micro/getPicAndCookie
+Content-Type: application/json
+
+{
+  "url":"http://172.15.28.113:8902"
+}
+
 
 ###鐭俊璁剧疆缂栬緫
 GET {{baseUrl}}/sms/set/edit?id={{SmsSet_id}}