diff --git a/base-manager/db/add.sql b/base-manager/db/add.sql
index 2d276e0df6b93e9bb184766377122eb60e6e8c3e..e701a218c26f0971009e3801d1db4881787f84bc 100644
--- a/base-manager/db/add.sql
+++ b/base-manager/db/add.sql
@@ -348,6 +348,11 @@ CREATE TABLE `mortals_sys_social_security_set`  (
     `az400` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏈哄叿缂栫爜',
     `sm4key` varchar(2048) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '绉侀挜',
     `serviceCode` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏀垮姟鎺掑彿璁よ瘉',
+    `bus_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏀垮姟涓氬姟璁よ瘉鐮�',
+    `orgName` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏈烘瀯鍚嶇О',
+    `address` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏈哄叿浣跨敤鍦板潃',
+    `regionCode` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍖哄煙鐮�',
+    `orgCode` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '缁熶竴绀句細淇$敤浠g爜',
     `enabled` tinyint(1) NULL DEFAULT 1 COMMENT '鍚敤寮€鍏�',
     `remark` varchar(512) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鐭俊绛惧悕',
     `createTime` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '鍒涘缓鏃堕棿',
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/social/model/SocialSecuritySetEntity.java b/base-manager/src/main/java/com/mortals/xhx/module/social/model/SocialSecuritySetEntity.java
index 3aa42573c72b5936251a7ab12a567a2001ac6165..e65bf5c797f0efe90079d1a61aa4c045cf0dfe5a 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/social/model/SocialSecuritySetEntity.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/social/model/SocialSecuritySetEntity.java
@@ -10,62 +10,82 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.social.model.vo.SocialSecuritySetVo;
 import lombok.Data;
 /**
-* 绀句繚閰嶇疆瀹炰綋瀵硅薄
-*
-* @author zxfei
-* @date 2025-03-21
-*/
+ * 绀句繚閰嶇疆瀹炰綋瀵硅薄
+ *
+ * @author zxfei
+ * @date 2025-03-21
+ */
 @Data
 public class SocialSecuritySetEntity extends SocialSecuritySetVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 绔欑偣id
-    */
+     * 绔欑偣id
+     */
     private Long siteId;
     /**
-    * 绔欑偣鍚嶇О
-    */
+     * 绔欑偣鍚嶇О
+     */
     private String siteName;
     /**
-    * 鎺ュ叆鏍囪瘑
-    */
+     * 鎺ュ叆鏍囪瘑
+     */
     private String appid;
     /**
-    * 娓犻亾鏍囪瘑-搴旂敤鏍囪瘑
-    */
+     * 娓犻亾鏍囪瘑-搴旂敤鏍囪瘑
+     */
     private String accessKey;
     /**
-    * 绉侀挜
-    */
+     * 绉侀挜
+     */
     private String privatKey;
     /**
-    * 娓犻亾瀵嗛挜
-    */
+     * 娓犻亾瀵嗛挜
+     */
     private String key;
     /**
-    * 鏈哄叿缂栫爜
-    */
+     * 鏈哄叿缂栫爜
+     */
     private String az400;
     /**
-    * 绉侀挜
-    */
+     * 绉侀挜
+     */
     private String sm4key;
     /**
-    * 鏀垮姟鎺掑彿璁よ瘉
-    */
+     * 鏀垮姟鎺掑彿璁よ瘉
+     */
     private String serviceCode;
     /**
-    * 鍚敤寮€鍏�
-    */
+     * 鍚敤寮€鍏�
+     */
     private Integer enabled;
     /**
-    * 鐭俊绛惧悕
-    */
+     * 鐭俊绛惧悕
+     */
     private String remark;
+    /**
+     * 鏀垮姟涓氬姟璁よ瘉鐮�
+     */
+    private String busCode;
+    /**
+     * 鏈烘瀯鍚嶇О
+     */
+    private String orgName;
+    /**
+     * 鏈哄叿浣跨敤鍦板潃
+     */
+    private String address;
+    /**
+     * 鍖哄煙鐮�
+     */
+    private String regionCode;
+    /**
+     * 缁熶竴绀句細淇$敤浠g爜
+     */
+    private String orgCode;
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -73,23 +93,28 @@ public class SocialSecuritySetEntity extends SocialSecuritySetVo {
         if (obj instanceof SocialSecuritySetEntity) {
             SocialSecuritySetEntity tmp = (SocialSecuritySetEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
     }
 
     public void initAttrValue(){
-            this.siteId = null;
-            this.siteName = "";
-            this.appid = "";
-            this.accessKey = "";
-            this.privatKey = "";
-            this.key = "";
-            this.az400 = "";
-            this.sm4key = "";
-            this.serviceCode = "";
-            this.enabled = 1;
-            this.remark = "";
+        this.siteId = null;
+        this.siteName = "";
+        this.appid = "";
+        this.accessKey = "";
+        this.privatKey = "";
+        this.key = "";
+        this.az400 = "";
+        this.sm4key = "";
+        this.serviceCode = "";
+        this.enabled = 1;
+        this.remark = "";
+        this.busCode = "";
+        this.orgName = "";
+        this.address = "";
+        this.regionCode = "";
+        this.orgCode = "";
     }
 }
\ No newline at end of file
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/social/model/SocialSecuritySetQuery.java b/base-manager/src/main/java/com/mortals/xhx/module/social/model/SocialSecuritySetQuery.java
index f9d09d3b463fceeeb171ceae62e4b2a1a0a791d5..0ed551ac98f870fbe80a65f2d3f6c6a184268019 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/social/model/SocialSecuritySetQuery.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/social/model/SocialSecuritySetQuery.java
@@ -3,11 +3,11 @@ package com.mortals.xhx.module.social.model;
 import java.util.List;
 import com.mortals.xhx.module.social.model.SocialSecuritySetEntity;
 /**
-* 绀句繚閰嶇疆鏌ヨ瀵硅薄
-*
-* @author zxfei
-* @date 2025-03-21
-*/
+ * 绀句繚閰嶇疆鏌ヨ瀵硅薄
+ *
+ * @author zxfei
+ * @date 2025-03-21
+ */
 public class SocialSecuritySetQuery extends SocialSecuritySetEntity {
     /** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
     private Long idStart;
@@ -126,6 +126,31 @@ public class SocialSecuritySetQuery extends SocialSecuritySetEntity {
     /** 缁撴潫 淇敼鏃堕棿 */
     private String updateTimeEnd;
 
+    /** 鏀垮姟涓氬姟璁よ瘉鐮� */
+    private List<String> busCodeList;
+
+    /** 鏀垮姟涓氬姟璁よ瘉鐮佹帓闄ゅ垪琛� */
+    private List <String> busCodeNotList;
+    /** 鏈烘瀯鍚嶇О */
+    private List<String> orgNameList;
+
+    /** 鏈烘瀯鍚嶇О鎺掗櫎鍒楄〃 */
+    private List <String> orgNameNotList;
+    /** 鏈哄叿浣跨敤鍦板潃 */
+    private List<String> addressList;
+
+    /** 鏈哄叿浣跨敤鍦板潃鎺掗櫎鍒楄〃 */
+    private List <String> addressNotList;
+    /** 鍖哄煙鐮� */
+    private List<String> regionCodeList;
+
+    /** 鍖哄煙鐮佹帓闄ゅ垪琛� */
+    private List <String> regionCodeNotList;
+    /** 缁熶竴绀句細淇$敤浠g爜 */
+    private List<String> orgCodeList;
+
+    /** 缁熶竴绀句細淇$敤浠g爜鎺掗櫎鍒楄〃 */
+    private List <String> orgCodeNotList;
     /** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<SocialSecuritySetQuery> orConditionList;
 
@@ -135,1098 +160,1353 @@ public class SocialSecuritySetQuery extends SocialSecuritySetEntity {
     public SocialSecuritySetQuery(){}
 
     /**
-    * 鑾峰彇 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
-    * @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;
     }
 
     /**
-    * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀�
-    * @return idNotList
-    */
+     * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀�
+     * @return idNotList
+     */
     public List<Long> getIdNotList(){
         return this.idNotList;
     }
 
     /**
-    * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
-    * @param idNotList
-    */
+     * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+     * @param idNotList
+     */
     public void setIdNotList(List<Long> idNotList){
         this.idNotList = idNotList;
     }
 
 
     /**
-    * 鑾峰彇 寮€濮� 绔欑偣id
-    * @return siteIdStart
-    */
+     * 鑾峰彇 寮€濮� 绔欑偣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;
     }
 
     /**
-    * 鑾峰彇 绔欑偣id
-    * @return siteIdNotList
-    */
+     * 鑾峰彇 绔欑偣id
+     * @return siteIdNotList
+     */
     public List<Long> getSiteIdNotList(){
         return this.siteIdNotList;
     }
 
     /**
-    * 璁剧疆 绔欑偣id
-    * @param siteIdNotList
-    */
+     * 璁剧疆 绔欑偣id
+     * @param siteIdNotList
+     */
     public void setSiteIdNotList(List<Long> siteIdNotList){
         this.siteIdNotList = siteIdNotList;
     }
 
 
     /**
-    * 鑾峰彇 绔欑偣鍚嶇О
-    * @return siteNameList
-    */
+     * 鑾峰彇 绔欑偣鍚嶇О
+     * @return siteNameList
+     */
     public List<String> getSiteNameList(){
         return this.siteNameList;
     }
 
     /**
-    * 璁剧疆 绔欑偣鍚嶇О
-    * @param siteNameList
-    */
+     * 璁剧疆 绔欑偣鍚嶇О
+     * @param siteNameList
+     */
     public void setSiteNameList(List<String> siteNameList){
         this.siteNameList = siteNameList;
     }
 
     /**
-    * 鑾峰彇 绔欑偣鍚嶇О
-    * @return siteNameNotList
-    */
+     * 鑾峰彇 绔欑偣鍚嶇О
+     * @return siteNameNotList
+     */
     public List<String> getSiteNameNotList(){
         return this.siteNameNotList;
     }
 
     /**
-    * 璁剧疆 绔欑偣鍚嶇О
-    * @param siteNameNotList
-    */
+     * 璁剧疆 绔欑偣鍚嶇О
+     * @param siteNameNotList
+     */
     public void setSiteNameNotList(List<String> siteNameNotList){
         this.siteNameNotList = siteNameNotList;
     }
 
     /**
-    * 鑾峰彇 鎺ュ叆鏍囪瘑
-    * @return appidList
-    */
+     * 鑾峰彇 鎺ュ叆鏍囪瘑
+     * @return appidList
+     */
     public List<String> getAppidList(){
         return this.appidList;
     }
 
     /**
-    * 璁剧疆 鎺ュ叆鏍囪瘑
-    * @param appidList
-    */
+     * 璁剧疆 鎺ュ叆鏍囪瘑
+     * @param appidList
+     */
     public void setAppidList(List<String> appidList){
         this.appidList = appidList;
     }
 
     /**
-    * 鑾峰彇 鎺ュ叆鏍囪瘑
-    * @return appidNotList
-    */
+     * 鑾峰彇 鎺ュ叆鏍囪瘑
+     * @return appidNotList
+     */
     public List<String> getAppidNotList(){
         return this.appidNotList;
     }
 
     /**
-    * 璁剧疆 鎺ュ叆鏍囪瘑
-    * @param appidNotList
-    */
+     * 璁剧疆 鎺ュ叆鏍囪瘑
+     * @param appidNotList
+     */
     public void setAppidNotList(List<String> appidNotList){
         this.appidNotList = appidNotList;
     }
 
     /**
-    * 鑾峰彇 娓犻亾鏍囪瘑-搴旂敤鏍囪瘑
-    * @return accessKeyList
-    */
+     * 鑾峰彇 娓犻亾鏍囪瘑-搴旂敤鏍囪瘑
+     * @return accessKeyList
+     */
     public List<String> getAccessKeyList(){
         return this.accessKeyList;
     }
 
     /**
-    * 璁剧疆 娓犻亾鏍囪瘑-搴旂敤鏍囪瘑
-    * @param accessKeyList
-    */
+     * 璁剧疆 娓犻亾鏍囪瘑-搴旂敤鏍囪瘑
+     * @param accessKeyList
+     */
     public void setAccessKeyList(List<String> accessKeyList){
         this.accessKeyList = accessKeyList;
     }
 
     /**
-    * 鑾峰彇 娓犻亾鏍囪瘑-搴旂敤鏍囪瘑
-    * @return accessKeyNotList
-    */
+     * 鑾峰彇 娓犻亾鏍囪瘑-搴旂敤鏍囪瘑
+     * @return accessKeyNotList
+     */
     public List<String> getAccessKeyNotList(){
         return this.accessKeyNotList;
     }
 
     /**
-    * 璁剧疆 娓犻亾鏍囪瘑-搴旂敤鏍囪瘑
-    * @param accessKeyNotList
-    */
+     * 璁剧疆 娓犻亾鏍囪瘑-搴旂敤鏍囪瘑
+     * @param accessKeyNotList
+     */
     public void setAccessKeyNotList(List<String> accessKeyNotList){
         this.accessKeyNotList = accessKeyNotList;
     }
 
     /**
-    * 鑾峰彇 绉侀挜
-    * @return privatKeyList
-    */
+     * 鑾峰彇 绉侀挜
+     * @return privatKeyList
+     */
     public List<String> getPrivatKeyList(){
         return this.privatKeyList;
     }
 
     /**
-    * 璁剧疆 绉侀挜
-    * @param privatKeyList
-    */
+     * 璁剧疆 绉侀挜
+     * @param privatKeyList
+     */
     public void setPrivatKeyList(List<String> privatKeyList){
         this.privatKeyList = privatKeyList;
     }
 
     /**
-    * 鑾峰彇 绉侀挜
-    * @return privatKeyNotList
-    */
+     * 鑾峰彇 绉侀挜
+     * @return privatKeyNotList
+     */
     public List<String> getPrivatKeyNotList(){
         return this.privatKeyNotList;
     }
 
     /**
-    * 璁剧疆 绉侀挜
-    * @param privatKeyNotList
-    */
+     * 璁剧疆 绉侀挜
+     * @param privatKeyNotList
+     */
     public void setPrivatKeyNotList(List<String> privatKeyNotList){
         this.privatKeyNotList = privatKeyNotList;
     }
 
     /**
-    * 鑾峰彇 娓犻亾瀵嗛挜
-    * @return keyList
-    */
+     * 鑾峰彇 娓犻亾瀵嗛挜
+     * @return keyList
+     */
     public List<String> getKeyList(){
         return this.keyList;
     }
 
     /**
-    * 璁剧疆 娓犻亾瀵嗛挜
-    * @param keyList
-    */
+     * 璁剧疆 娓犻亾瀵嗛挜
+     * @param keyList
+     */
     public void setKeyList(List<String> keyList){
         this.keyList = keyList;
     }
 
     /**
-    * 鑾峰彇 娓犻亾瀵嗛挜
-    * @return keyNotList
-    */
+     * 鑾峰彇 娓犻亾瀵嗛挜
+     * @return keyNotList
+     */
     public List<String> getKeyNotList(){
         return this.keyNotList;
     }
 
     /**
-    * 璁剧疆 娓犻亾瀵嗛挜
-    * @param keyNotList
-    */
+     * 璁剧疆 娓犻亾瀵嗛挜
+     * @param keyNotList
+     */
     public void setKeyNotList(List<String> keyNotList){
         this.keyNotList = keyNotList;
     }
 
     /**
-    * 鑾峰彇 鏈哄叿缂栫爜
-    * @return az400List
-    */
+     * 鑾峰彇 鏈哄叿缂栫爜
+     * @return az400List
+     */
     public List<String> getAz400List(){
         return this.az400List;
     }
 
     /**
-    * 璁剧疆 鏈哄叿缂栫爜
-    * @param az400List
-    */
+     * 璁剧疆 鏈哄叿缂栫爜
+     * @param az400List
+     */
     public void setAz400List(List<String> az400List){
         this.az400List = az400List;
     }
 
     /**
-    * 鑾峰彇 鏈哄叿缂栫爜
-    * @return az400NotList
-    */
+     * 鑾峰彇 鏈哄叿缂栫爜
+     * @return az400NotList
+     */
     public List<String> getAz400NotList(){
         return this.az400NotList;
     }
 
     /**
-    * 璁剧疆 鏈哄叿缂栫爜
-    * @param az400NotList
-    */
+     * 璁剧疆 鏈哄叿缂栫爜
+     * @param az400NotList
+     */
     public void setAz400NotList(List<String> az400NotList){
         this.az400NotList = az400NotList;
     }
 
     /**
-    * 鑾峰彇 绉侀挜
-    * @return sm4keyList
-    */
+     * 鑾峰彇 绉侀挜
+     * @return sm4keyList
+     */
     public List<String> getSm4keyList(){
         return this.sm4keyList;
     }
 
     /**
-    * 璁剧疆 绉侀挜
-    * @param sm4keyList
-    */
+     * 璁剧疆 绉侀挜
+     * @param sm4keyList
+     */
     public void setSm4keyList(List<String> sm4keyList){
         this.sm4keyList = sm4keyList;
     }
 
     /**
-    * 鑾峰彇 绉侀挜
-    * @return sm4keyNotList
-    */
+     * 鑾峰彇 绉侀挜
+     * @return sm4keyNotList
+     */
     public List<String> getSm4keyNotList(){
         return this.sm4keyNotList;
     }
 
     /**
-    * 璁剧疆 绉侀挜
-    * @param sm4keyNotList
-    */
+     * 璁剧疆 绉侀挜
+     * @param sm4keyNotList
+     */
     public void setSm4keyNotList(List<String> sm4keyNotList){
         this.sm4keyNotList = sm4keyNotList;
     }
 
     /**
-    * 鑾峰彇 鏀垮姟鎺掑彿璁よ瘉
-    * @return serviceCodeList
-    */
+     * 鑾峰彇 鏀垮姟鎺掑彿璁よ瘉
+     * @return serviceCodeList
+     */
     public List<String> getServiceCodeList(){
         return this.serviceCodeList;
     }
 
     /**
-    * 璁剧疆 鏀垮姟鎺掑彿璁よ瘉
-    * @param serviceCodeList
-    */
+     * 璁剧疆 鏀垮姟鎺掑彿璁よ瘉
+     * @param serviceCodeList
+     */
     public void setServiceCodeList(List<String> serviceCodeList){
         this.serviceCodeList = serviceCodeList;
     }
 
     /**
-    * 鑾峰彇 鏀垮姟鎺掑彿璁よ瘉
-    * @return serviceCodeNotList
-    */
+     * 鑾峰彇 鏀垮姟鎺掑彿璁よ瘉
+     * @return serviceCodeNotList
+     */
     public List<String> getServiceCodeNotList(){
         return this.serviceCodeNotList;
     }
 
     /**
-    * 璁剧疆 鏀垮姟鎺掑彿璁よ瘉
-    * @param serviceCodeNotList
-    */
+     * 璁剧疆 鏀垮姟鎺掑彿璁よ瘉
+     * @param serviceCodeNotList
+     */
     public void setServiceCodeNotList(List<String> serviceCodeNotList){
         this.serviceCodeNotList = serviceCodeNotList;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 鍚敤寮€鍏�
-    * @return enabledStart
-    */
+     * 鑾峰彇 寮€濮� 鍚敤寮€鍏�
+     * @return enabledStart
+     */
     public Integer getEnabledStart(){
         return this.enabledStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鍚敤寮€鍏�
-    * @param enabledStart
-    */
+     * 璁剧疆 寮€濮� 鍚敤寮€鍏�
+     * @param enabledStart
+     */
     public void setEnabledStart(Integer enabledStart){
         this.enabledStart = enabledStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鍚敤寮€鍏�
-    * @return $enabledEnd
-    */
+     * 鑾峰彇 缁撴潫 鍚敤寮€鍏�
+     * @return $enabledEnd
+     */
     public Integer getEnabledEnd(){
         return this.enabledEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍚敤寮€鍏�
-    * @param enabledEnd
-    */
+     * 璁剧疆 缁撴潫 鍚敤寮€鍏�
+     * @param enabledEnd
+     */
     public void setEnabledEnd(Integer enabledEnd){
         this.enabledEnd = enabledEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 鍚敤寮€鍏�
-    * @return enabledIncrement
-    */
+     * 鑾峰彇 澧炲姞 鍚敤寮€鍏�
+     * @return enabledIncrement
+     */
     public Integer getEnabledIncrement(){
         return this.enabledIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鍚敤寮€鍏�
-    * @param enabledIncrement
-    */
+     * 璁剧疆 澧炲姞 鍚敤寮€鍏�
+     * @param enabledIncrement
+     */
     public void setEnabledIncrement(Integer enabledIncrement){
         this.enabledIncrement = enabledIncrement;
     }
 
     /**
-    * 鑾峰彇 鍚敤寮€鍏�
-    * @return enabledList
-    */
+     * 鑾峰彇 鍚敤寮€鍏�
+     * @return enabledList
+     */
     public List<Integer> getEnabledList(){
         return this.enabledList;
     }
 
     /**
-    * 璁剧疆 鍚敤寮€鍏�
-    * @param enabledList
-    */
+     * 璁剧疆 鍚敤寮€鍏�
+     * @param enabledList
+     */
     public void setEnabledList(List<Integer> enabledList){
         this.enabledList = enabledList;
     }
 
     /**
-    * 鑾峰彇 鍚敤寮€鍏�
-    * @return enabledNotList
-    */
+     * 鑾峰彇 鍚敤寮€鍏�
+     * @return enabledNotList
+     */
     public List<Integer> getEnabledNotList(){
         return this.enabledNotList;
     }
 
     /**
-    * 璁剧疆 鍚敤寮€鍏�
-    * @param enabledNotList
-    */
+     * 璁剧疆 鍚敤寮€鍏�
+     * @param enabledNotList
+     */
     public void setEnabledNotList(List<Integer> enabledNotList){
         this.enabledNotList = enabledNotList;
     }
 
 
     /**
-    * 鑾峰彇 鐭俊绛惧悕
-    * @return remarkList
-    */
+     * 鑾峰彇 鐭俊绛惧悕
+     * @return remarkList
+     */
     public List<String> getRemarkList(){
         return this.remarkList;
     }
 
     /**
-    * 璁剧疆 鐭俊绛惧悕
-    * @param remarkList
-    */
+     * 璁剧疆 鐭俊绛惧悕
+     * @param remarkList
+     */
     public void setRemarkList(List<String> remarkList){
         this.remarkList = remarkList;
     }
 
     /**
-    * 鑾峰彇 鐭俊绛惧悕
-    * @return remarkNotList
-    */
+     * 鑾峰彇 鐭俊绛惧悕
+     * @return remarkNotList
+     */
     public List<String> getRemarkNotList(){
         return this.remarkNotList;
     }
 
     /**
-    * 璁剧疆 鐭俊绛惧悕
-    * @param remarkNotList
-    */
+     * 璁剧疆 鐭俊绛惧悕
+     * @param remarkNotList
+     */
     public void setRemarkNotList(List<String> remarkNotList){
         this.remarkNotList = remarkNotList;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
-    * @return createTimeStart
-    */
+     * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
+     * @return createTimeStart
+     */
     public String getCreateTimeStart(){
         return this.createTimeStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
-    * @param createTimeStart
-    */
+     * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
+     * @param createTimeStart
+     */
     public void setCreateTimeStart(String createTimeStart){
         this.createTimeStart = createTimeStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
-    * @return createTimeEnd
-    */
+     * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
+     * @return createTimeEnd
+     */
     public String getCreateTimeEnd(){
         return this.createTimeEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
-    * @param createTimeEnd
-    */
+     * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
+     * @param createTimeEnd
+     */
     public void setCreateTimeEnd(String createTimeEnd){
         this.createTimeEnd = createTimeEnd;
     }
 
     /**
-    * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛
-    * @return createUserIdStart
-    */
+     * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛
+     * @return createUserIdStart
+     */
     public Long getCreateUserIdStart(){
         return this.createUserIdStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
-    * @param createUserIdStart
-    */
+     * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
+     * @param createUserIdStart
+     */
     public void setCreateUserIdStart(Long createUserIdStart){
         this.createUserIdStart = createUserIdStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛
-    * @return $createUserIdEnd
-    */
+     * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛
+     * @return $createUserIdEnd
+     */
     public Long getCreateUserIdEnd(){
         return this.createUserIdEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
-    * @param createUserIdEnd
-    */
+     * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
+     * @param createUserIdEnd
+     */
     public void setCreateUserIdEnd(Long createUserIdEnd){
         this.createUserIdEnd = createUserIdEnd;
     }
 
     /**
-    * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛
-    * @return createUserIdIncrement
-    */
+     * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛
+     * @return createUserIdIncrement
+     */
     public Long getCreateUserIdIncrement(){
         return this.createUserIdIncrement;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
-    * @param createUserIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
+     * @param createUserIdIncrement
+     */
     public void setCreateUserIdIncrement(Long createUserIdIncrement){
         this.createUserIdIncrement = createUserIdIncrement;
     }
 
     /**
-    * 鑾峰彇 鍒涘缓鐢ㄦ埛
-    * @return createUserIdList
-    */
+     * 鑾峰彇 鍒涘缓鐢ㄦ埛
+     * @return createUserIdList
+     */
     public List<Long> getCreateUserIdList(){
         return this.createUserIdList;
     }
 
     /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛
-    * @param createUserIdList
-    */
+     * 璁剧疆 鍒涘缓鐢ㄦ埛
+     * @param createUserIdList
+     */
     public void setCreateUserIdList(List<Long> createUserIdList){
         this.createUserIdList = createUserIdList;
     }
 
     /**
-    * 鑾峰彇 鍒涘缓鐢ㄦ埛
-    * @return createUserIdNotList
-    */
+     * 鑾峰彇 鍒涘缓鐢ㄦ埛
+     * @return createUserIdNotList
+     */
     public List<Long> getCreateUserIdNotList(){
         return this.createUserIdNotList;
     }
 
     /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛
-    * @param createUserIdNotList
-    */
+     * 璁剧疆 鍒涘缓鐢ㄦ埛
+     * @param createUserIdNotList
+     */
     public void setCreateUserIdNotList(List<Long> createUserIdNotList){
         this.createUserIdNotList = createUserIdNotList;
     }
 
 
     /**
-    * 鑾峰彇 寮€濮� 淇敼鏃堕棿
-    * @return updateTimeStart
-    */
+     * 鑾峰彇 寮€濮� 淇敼鏃堕棿
+     * @return updateTimeStart
+     */
     public String getUpdateTimeStart(){
         return this.updateTimeStart;
     }
 
     /**
-    * 璁剧疆 寮€濮� 淇敼鏃堕棿
-    * @param updateTimeStart
-    */
+     * 璁剧疆 寮€濮� 淇敼鏃堕棿
+     * @param updateTimeStart
+     */
     public void setUpdateTimeStart(String updateTimeStart){
         this.updateTimeStart = updateTimeStart;
     }
 
     /**
-    * 鑾峰彇 缁撴潫 淇敼鏃堕棿
-    * @return updateTimeEnd
-    */
+     * 鑾峰彇 缁撴潫 淇敼鏃堕棿
+     * @return updateTimeEnd
+     */
     public String getUpdateTimeEnd(){
         return this.updateTimeEnd;
     }
 
     /**
-    * 璁剧疆 缁撴潫 淇敼鏃堕棿
-    * @param updateTimeEnd
-    */
+     * 璁剧疆 缁撴潫 淇敼鏃堕棿
+     * @param updateTimeEnd
+     */
     public void setUpdateTimeEnd(String updateTimeEnd){
         this.updateTimeEnd = updateTimeEnd;
     }
 
     /**
-    * 璁剧疆  搴忓彿锛屼富閿紝鑷闀�
-    * @param id
-    */
+     * 鑾峰彇 鏀垮姟涓氬姟璁よ瘉鐮�
+     * @return busCodeList
+     */
+    public List<String> getBusCodeList(){
+        return this.busCodeList;
+    }
+
+    /**
+     * 璁剧疆 鏀垮姟涓氬姟璁よ瘉鐮�
+     * @param busCodeList
+     */
+    public void setBusCodeList(List<String> busCodeList){
+        this.busCodeList = busCodeList;
+    }
+
+    /**
+     * 鑾峰彇 鏀垮姟涓氬姟璁よ瘉鐮�
+     * @return busCodeNotList
+     */
+    public List<String> getBusCodeNotList(){
+        return this.busCodeNotList;
+    }
+
+    /**
+     * 璁剧疆 鏀垮姟涓氬姟璁よ瘉鐮�
+     * @param busCodeNotList
+     */
+    public void setBusCodeNotList(List<String> busCodeNotList){
+        this.busCodeNotList = busCodeNotList;
+    }
+
+    /**
+     * 鑾峰彇 鏈烘瀯鍚嶇О
+     * @return orgNameList
+     */
+    public List<String> getOrgNameList(){
+        return this.orgNameList;
+    }
+
+    /**
+     * 璁剧疆 鏈烘瀯鍚嶇О
+     * @param orgNameList
+     */
+    public void setOrgNameList(List<String> orgNameList){
+        this.orgNameList = orgNameList;
+    }
+
+    /**
+     * 鑾峰彇 鏈烘瀯鍚嶇О
+     * @return orgNameNotList
+     */
+    public List<String> getOrgNameNotList(){
+        return this.orgNameNotList;
+    }
+
+    /**
+     * 璁剧疆 鏈烘瀯鍚嶇О
+     * @param orgNameNotList
+     */
+    public void setOrgNameNotList(List<String> orgNameNotList){
+        this.orgNameNotList = orgNameNotList;
+    }
+
+    /**
+     * 鑾峰彇 鏈哄叿浣跨敤鍦板潃
+     * @return addressList
+     */
+    public List<String> getAddressList(){
+        return this.addressList;
+    }
+
+    /**
+     * 璁剧疆 鏈哄叿浣跨敤鍦板潃
+     * @param addressList
+     */
+    public void setAddressList(List<String> addressList){
+        this.addressList = addressList;
+    }
+
+    /**
+     * 鑾峰彇 鏈哄叿浣跨敤鍦板潃
+     * @return addressNotList
+     */
+    public List<String> getAddressNotList(){
+        return this.addressNotList;
+    }
+
+    /**
+     * 璁剧疆 鏈哄叿浣跨敤鍦板潃
+     * @param addressNotList
+     */
+    public void setAddressNotList(List<String> addressNotList){
+        this.addressNotList = addressNotList;
+    }
+
+    /**
+     * 鑾峰彇 鍖哄煙鐮�
+     * @return regionCodeList
+     */
+    public List<String> getRegionCodeList(){
+        return this.regionCodeList;
+    }
+
+    /**
+     * 璁剧疆 鍖哄煙鐮�
+     * @param regionCodeList
+     */
+    public void setRegionCodeList(List<String> regionCodeList){
+        this.regionCodeList = regionCodeList;
+    }
+
+    /**
+     * 鑾峰彇 鍖哄煙鐮�
+     * @return regionCodeNotList
+     */
+    public List<String> getRegionCodeNotList(){
+        return this.regionCodeNotList;
+    }
+
+    /**
+     * 璁剧疆 鍖哄煙鐮�
+     * @param regionCodeNotList
+     */
+    public void setRegionCodeNotList(List<String> regionCodeNotList){
+        this.regionCodeNotList = regionCodeNotList;
+    }
+
+    /**
+     * 鑾峰彇 缁熶竴绀句細淇$敤浠g爜
+     * @return orgCodeList
+     */
+    public List<String> getOrgCodeList(){
+        return this.orgCodeList;
+    }
+
+    /**
+     * 璁剧疆 缁熶竴绀句細淇$敤浠g爜
+     * @param orgCodeList
+     */
+    public void setOrgCodeList(List<String> orgCodeList){
+        this.orgCodeList = orgCodeList;
+    }
+
+    /**
+     * 鑾峰彇 缁熶竴绀句細淇$敤浠g爜
+     * @return orgCodeNotList
+     */
+    public List<String> getOrgCodeNotList(){
+        return this.orgCodeNotList;
+    }
+
+    /**
+     * 璁剧疆 缁熶竴绀句細淇$敤浠g爜
+     * @param orgCodeNotList
+     */
+    public void setOrgCodeNotList(List<String> orgCodeNotList){
+        this.orgCodeNotList = orgCodeNotList;
+    }
+
+    /**
+     * 璁剧疆  搴忓彿锛屼富閿紝鑷闀�
+     * @param id
+     */
     public SocialSecuritySetQuery id(Long id){
-	    setId(id);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
-    * @param idStart
-    */
+        setId(id);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
+     * @param idStart
+     */
     public SocialSecuritySetQuery idStart(Long idStart){
-		this.idStart = idStart;
-		return this;
+        this.idStart = idStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
-    * @param idEnd
-    */
+     * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
+     * @param idEnd
+     */
     public SocialSecuritySetQuery idEnd(Long idEnd){
-		this.idEnd = idEnd;
-		return this;
+        this.idEnd = idEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
-    * @param idIncrement
-    */
+     * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
+     * @param idIncrement
+     */
     public SocialSecuritySetQuery idIncrement(Long idIncrement){
-		this.idIncrement = idIncrement;
-		return this;
+        this.idIncrement = idIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
-    * @param idList
-    */
+     * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+     * @param idList
+     */
     public SocialSecuritySetQuery idList(List<Long> idList){
         this.idList = idList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
-        * @param idNotList
-        */
-        public SocialSecuritySetQuery idNotList(List<Long> idNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
+     * @param idNotList
+     */
+    public SocialSecuritySetQuery idNotList(List<Long> idNotList){
         this.idNotList = idNotList;
         return this;
-        }
+    }
 
     /**
-    * 璁剧疆  绔欑偣id
-    * @param siteId
-    */
+     * 璁剧疆  绔欑偣id
+     * @param siteId
+     */
     public SocialSecuritySetQuery siteId(Long siteId){
-	    setSiteId(siteId);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 绔欑偣id
-    * @param siteIdStart
-    */
+        setSiteId(siteId);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 绔欑偣id
+     * @param siteIdStart
+     */
     public SocialSecuritySetQuery siteIdStart(Long siteIdStart){
-		this.siteIdStart = siteIdStart;
-		return this;
+        this.siteIdStart = siteIdStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 绔欑偣id
-    * @param siteIdEnd
-    */
+     * 璁剧疆 缁撴潫 绔欑偣id
+     * @param siteIdEnd
+     */
     public SocialSecuritySetQuery siteIdEnd(Long siteIdEnd){
-		this.siteIdEnd = siteIdEnd;
-		return this;
+        this.siteIdEnd = siteIdEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 绔欑偣id
-    * @param siteIdIncrement
-    */
+     * 璁剧疆 澧炲姞 绔欑偣id
+     * @param siteIdIncrement
+     */
     public SocialSecuritySetQuery siteIdIncrement(Long siteIdIncrement){
-		this.siteIdIncrement = siteIdIncrement;
-		return this;
+        this.siteIdIncrement = siteIdIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 绔欑偣id
-    * @param siteIdList
-    */
+     * 璁剧疆 绔欑偣id
+     * @param siteIdList
+     */
     public SocialSecuritySetQuery siteIdList(List<Long> siteIdList){
         this.siteIdList = siteIdList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 绔欑偣id
-        * @param siteIdNotList
-        */
-        public SocialSecuritySetQuery siteIdNotList(List<Long> siteIdNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 绔欑偣id
+     * @param siteIdNotList
+     */
+    public SocialSecuritySetQuery siteIdNotList(List<Long> siteIdNotList){
         this.siteIdNotList = siteIdNotList;
         return this;
-        }
+    }
 
 
-	/**
-    * 璁剧疆 绔欑偣鍚嶇О
-    * @param siteName
-    */
+    /**
+     * 璁剧疆 绔欑偣鍚嶇О
+     * @param siteName
+     */
     public SocialSecuritySetQuery siteName(String siteName){
         setSiteName(siteName);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 绔欑偣鍚嶇О
-    * @param siteNameList
-    */
+     * 璁剧疆 绔欑偣鍚嶇О
+     * @param siteNameList
+     */
     public SocialSecuritySetQuery siteNameList(List<String> siteNameList){
         this.siteNameList = siteNameList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 璁剧疆 鎺ュ叆鏍囪瘑
-    * @param appid
-    */
+    /**
+     * 璁剧疆 鎺ュ叆鏍囪瘑
+     * @param appid
+     */
     public SocialSecuritySetQuery appid(String appid){
         setAppid(appid);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 鎺ュ叆鏍囪瘑
-    * @param appidList
-    */
+     * 璁剧疆 鎺ュ叆鏍囪瘑
+     * @param appidList
+     */
     public SocialSecuritySetQuery appidList(List<String> appidList){
         this.appidList = appidList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 璁剧疆 娓犻亾鏍囪瘑-搴旂敤鏍囪瘑
-    * @param accessKey
-    */
+    /**
+     * 璁剧疆 娓犻亾鏍囪瘑-搴旂敤鏍囪瘑
+     * @param accessKey
+     */
     public SocialSecuritySetQuery accessKey(String accessKey){
         setAccessKey(accessKey);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 娓犻亾鏍囪瘑-搴旂敤鏍囪瘑
-    * @param accessKeyList
-    */
+     * 璁剧疆 娓犻亾鏍囪瘑-搴旂敤鏍囪瘑
+     * @param accessKeyList
+     */
     public SocialSecuritySetQuery accessKeyList(List<String> accessKeyList){
         this.accessKeyList = accessKeyList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 璁剧疆 绉侀挜
-    * @param privatKey
-    */
+    /**
+     * 璁剧疆 绉侀挜
+     * @param privatKey
+     */
     public SocialSecuritySetQuery privatKey(String privatKey){
         setPrivatKey(privatKey);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 绉侀挜
-    * @param privatKeyList
-    */
+     * 璁剧疆 绉侀挜
+     * @param privatKeyList
+     */
     public SocialSecuritySetQuery privatKeyList(List<String> privatKeyList){
         this.privatKeyList = privatKeyList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 璁剧疆 娓犻亾瀵嗛挜
-    * @param key
-    */
+    /**
+     * 璁剧疆 娓犻亾瀵嗛挜
+     * @param key
+     */
     public SocialSecuritySetQuery key(String key){
         setKey(key);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 娓犻亾瀵嗛挜
-    * @param keyList
-    */
+     * 璁剧疆 娓犻亾瀵嗛挜
+     * @param keyList
+     */
     public SocialSecuritySetQuery keyList(List<String> keyList){
         this.keyList = keyList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 璁剧疆 鏈哄叿缂栫爜
-    * @param az400
-    */
+    /**
+     * 璁剧疆 鏈哄叿缂栫爜
+     * @param az400
+     */
     public SocialSecuritySetQuery az400(String az400){
         setAz400(az400);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 鏈哄叿缂栫爜
-    * @param az400List
-    */
+     * 璁剧疆 鏈哄叿缂栫爜
+     * @param az400List
+     */
     public SocialSecuritySetQuery az400List(List<String> az400List){
         this.az400List = az400List;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 璁剧疆 绉侀挜
-    * @param sm4key
-    */
+    /**
+     * 璁剧疆 绉侀挜
+     * @param sm4key
+     */
     public SocialSecuritySetQuery sm4key(String sm4key){
         setSm4key(sm4key);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 绉侀挜
-    * @param sm4keyList
-    */
+     * 璁剧疆 绉侀挜
+     * @param sm4keyList
+     */
     public SocialSecuritySetQuery sm4keyList(List<String> sm4keyList){
         this.sm4keyList = sm4keyList;
-		return this;
+        return this;
     }
 
 
-	/**
-    * 璁剧疆 鏀垮姟鎺掑彿璁よ瘉
-    * @param serviceCode
-    */
+    /**
+     * 璁剧疆 鏀垮姟鎺掑彿璁よ瘉
+     * @param serviceCode
+     */
     public SocialSecuritySetQuery serviceCode(String serviceCode){
         setServiceCode(serviceCode);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 鏀垮姟鎺掑彿璁よ瘉
-    * @param serviceCodeList
-    */
+     * 璁剧疆 鏀垮姟鎺掑彿璁よ瘉
+     * @param serviceCodeList
+     */
     public SocialSecuritySetQuery serviceCodeList(List<String> serviceCodeList){
         this.serviceCodeList = serviceCodeList;
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆  鍚敤寮€鍏�
-    * @param enabled
-    */
+     * 璁剧疆  鍚敤寮€鍏�
+     * @param enabled
+     */
     public SocialSecuritySetQuery enabled(Integer enabled){
-	    setEnabled(enabled);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 鍚敤寮€鍏�
-    * @param enabledStart
-    */
+        setEnabled(enabled);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鍚敤寮€鍏�
+     * @param enabledStart
+     */
     public SocialSecuritySetQuery enabledStart(Integer enabledStart){
-		this.enabledStart = enabledStart;
-		return this;
+        this.enabledStart = enabledStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍚敤寮€鍏�
-    * @param enabledEnd
-    */
+     * 璁剧疆 缁撴潫 鍚敤寮€鍏�
+     * @param enabledEnd
+     */
     public SocialSecuritySetQuery enabledEnd(Integer enabledEnd){
-		this.enabledEnd = enabledEnd;
-		return this;
+        this.enabledEnd = enabledEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鍚敤寮€鍏�
-    * @param enabledIncrement
-    */
+     * 璁剧疆 澧炲姞 鍚敤寮€鍏�
+     * @param enabledIncrement
+     */
     public SocialSecuritySetQuery enabledIncrement(Integer enabledIncrement){
-		this.enabledIncrement = enabledIncrement;
-		return this;
+        this.enabledIncrement = enabledIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 鍚敤寮€鍏�
-    * @param enabledList
-    */
+     * 璁剧疆 鍚敤寮€鍏�
+     * @param enabledList
+     */
     public SocialSecuritySetQuery enabledList(List<Integer> enabledList){
         this.enabledList = enabledList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 鍚敤寮€鍏�
-        * @param enabledNotList
-        */
-        public SocialSecuritySetQuery enabledNotList(List<Integer> enabledNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 鍚敤寮€鍏�
+     * @param enabledNotList
+     */
+    public SocialSecuritySetQuery enabledNotList(List<Integer> enabledNotList){
         this.enabledNotList = enabledNotList;
         return this;
-        }
+    }
 
 
-	/**
-    * 璁剧疆 鐭俊绛惧悕
-    * @param remark
-    */
+    /**
+     * 璁剧疆 鐭俊绛惧悕
+     * @param remark
+     */
     public SocialSecuritySetQuery remark(String remark){
         setRemark(remark);
-		return this;
+        return this;
     }
 
     /**
-    * 璁剧疆 鐭俊绛惧悕
-    * @param remarkList
-    */
+     * 璁剧疆 鐭俊绛惧悕
+     * @param remarkList
+     */
     public SocialSecuritySetQuery remarkList(List<String> remarkList){
         this.remarkList = remarkList;
-		return this;
+        return this;
     }
 
 
     /**
-    * 璁剧疆  鍒涘缓鐢ㄦ埛
-    * @param createUserId
-    */
+     * 璁剧疆  鍒涘缓鐢ㄦ埛
+     * @param createUserId
+     */
     public SocialSecuritySetQuery createUserId(Long createUserId){
-	    setCreateUserId(createUserId);
-		return this;
-    }
-	
-	 /**
-    * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
-    * @param createUserIdStart
-    */
+        setCreateUserId(createUserId);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
+     * @param createUserIdStart
+     */
     public SocialSecuritySetQuery createUserIdStart(Long createUserIdStart){
-		this.createUserIdStart = createUserIdStart;
-		return this;
+        this.createUserIdStart = createUserIdStart;
+        return this;
     }
 
     /**
-    * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
-    * @param createUserIdEnd
-    */
+     * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
+     * @param createUserIdEnd
+     */
     public SocialSecuritySetQuery createUserIdEnd(Long createUserIdEnd){
-		this.createUserIdEnd = createUserIdEnd;
-		return this;
+        this.createUserIdEnd = createUserIdEnd;
+        return this;
     }
 
     /**
-    * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
-    * @param createUserIdIncrement
-    */
+     * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
+     * @param createUserIdIncrement
+     */
     public SocialSecuritySetQuery createUserIdIncrement(Long createUserIdIncrement){
-		this.createUserIdIncrement = createUserIdIncrement;
-		return this;
+        this.createUserIdIncrement = createUserIdIncrement;
+        return this;
     }
 
     /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛
-    * @param createUserIdList
-    */
+     * 璁剧疆 鍒涘缓鐢ㄦ埛
+     * @param createUserIdList
+     */
     public SocialSecuritySetQuery createUserIdList(List<Long> createUserIdList){
         this.createUserIdList = createUserIdList;
-		return this;
-        }
-
-        /**
-        * 璁剧疆 鍒涘缓鐢ㄦ埛
-        * @param createUserIdNotList
-        */
-        public SocialSecuritySetQuery createUserIdNotList(List<Long> createUserIdNotList){
+        return this;
+    }
+
+    /**
+     * 璁剧疆 鍒涘缓鐢ㄦ埛
+     * @param createUserIdNotList
+     */
+    public SocialSecuritySetQuery createUserIdNotList(List<Long> createUserIdNotList){
         this.createUserIdNotList = createUserIdNotList;
         return this;
-        }
+    }
 
 
+
+    /**
+     * 璁剧疆 鏀垮姟涓氬姟璁よ瘉鐮�
+     * @param busCode
+     */
+    public SocialSecuritySetQuery busCode(String busCode){
+        setBusCode(busCode);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 鏀垮姟涓氬姟璁よ瘉鐮�
+     * @param busCodeList
+     */
+    public SocialSecuritySetQuery busCodeList(List<String> busCodeList){
+        this.busCodeList = busCodeList;
+        return this;
+    }
+
+
+    /**
+     * 璁剧疆 鏈烘瀯鍚嶇О
+     * @param orgName
+     */
+    public SocialSecuritySetQuery orgName(String orgName){
+        setOrgName(orgName);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 鏈烘瀯鍚嶇О
+     * @param orgNameList
+     */
+    public SocialSecuritySetQuery orgNameList(List<String> orgNameList){
+        this.orgNameList = orgNameList;
+        return this;
+    }
+
+
+    /**
+     * 璁剧疆 鏈哄叿浣跨敤鍦板潃
+     * @param address
+     */
+    public SocialSecuritySetQuery address(String address){
+        setAddress(address);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 鏈哄叿浣跨敤鍦板潃
+     * @param addressList
+     */
+    public SocialSecuritySetQuery addressList(List<String> addressList){
+        this.addressList = addressList;
+        return this;
+    }
+
+
+    /**
+     * 璁剧疆 鍖哄煙鐮�
+     * @param regionCode
+     */
+    public SocialSecuritySetQuery regionCode(String regionCode){
+        setRegionCode(regionCode);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 鍖哄煙鐮�
+     * @param regionCodeList
+     */
+    public SocialSecuritySetQuery regionCodeList(List<String> regionCodeList){
+        this.regionCodeList = regionCodeList;
+        return this;
+    }
+
+
+    /**
+     * 璁剧疆 缁熶竴绀句細淇$敤浠g爜
+     * @param orgCode
+     */
+    public SocialSecuritySetQuery orgCode(String orgCode){
+        setOrgCode(orgCode);
+        return this;
+    }
+
+    /**
+     * 璁剧疆 缁熶竴绀句細淇$敤浠g爜
+     * @param orgCodeList
+     */
+    public SocialSecuritySetQuery orgCodeList(List<String> orgCodeList){
+        this.orgCodeList = orgCodeList;
+        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<SocialSecuritySetQuery> 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<SocialSecuritySetQuery> 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<SocialSecuritySetQuery> 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<SocialSecuritySetQuery> andConditionList){
         this.andConditionList = andConditionList;
     }
diff --git a/base-manager/src/main/resources/sqlmap/module/social/SocialSecuritySetMapper.xml b/base-manager/src/main/resources/sqlmap/module/social/SocialSecuritySetMapper.xml
index 47a291a837a45795eb8a28ca131877ede7007e5b..91f4c97af73dd797077e3757b9d31189107212a4 100644
--- a/base-manager/src/main/resources/sqlmap/module/social/SocialSecuritySetMapper.xml
+++ b/base-manager/src/main/resources/sqlmap/module/social/SocialSecuritySetMapper.xml
@@ -1,92 +1,112 @@
 <?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.social.dao.ibatis.SocialSecuritySetDaoImpl">
 
     <!-- 瀛楁鍜屽睘鎬ф槧灏� -->
     <resultMap type="SocialSecuritySetEntity" id="SocialSecuritySetEntity-Map">
-            <id  property="id" column="id" />
-            <result property="siteId" column="siteId" />
-            <result property="siteName" column="siteName" />
-            <result property="appid" column="appid" />
-            <result property="accessKey" column="access_key" />
-            <result property="privatKey" column="privat_key" />
-            <result property="key" column="key" />
-            <result property="az400" column="az400" />
-            <result property="sm4key" column="sm4key" />
-            <result property="serviceCode" column="serviceCode" />
-            <result property="enabled" column="enabled" />
-            <result property="remark" column="remark" />
-            <result property="createTime" column="createTime" />
-            <result property="createUserId" column="createUserId" />
-            <result property="updateTime" column="updateTime" />
+        <id  property="id" column="id" />
+        <result property="siteId" column="siteId" />
+        <result property="siteName" column="siteName" />
+        <result property="appid" column="appid" />
+        <result property="accessKey" column="access_key" />
+        <result property="privatKey" column="privat_key" />
+        <result property="key" column="key" />
+        <result property="az400" column="az400" />
+        <result property="sm4key" column="sm4key" />
+        <result property="serviceCode" column="serviceCode" />
+        <result property="enabled" column="enabled" />
+        <result property="remark" column="remark" />
+        <result property="createTime" column="createTime" />
+        <result property="createUserId" column="createUserId" />
+        <result property="updateTime" column="updateTime" />
+        <result property="busCode" column="bus_code" />
+        <result property="orgName" column="orgName" />
+        <result property="address" column="address" />
+        <result property="regionCode" column="regionCode" />
+        <result property="orgCode" column="orgCode" />
     </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,
-                </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('appid') or colPickMode == 1 and data.containsKey('appid')))">
-                    a.appid,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('accessKey') or colPickMode == 1 and data.containsKey('accessKey')))">
-                    a.access_key,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('privatKey') or colPickMode == 1 and data.containsKey('privatKey')))">
-                    a.privat_key,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('key') or colPickMode == 1 and data.containsKey('key')))">
-                    a.`key`,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('az400') or colPickMode == 1 and data.containsKey('az400')))">
-                    a.az400,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sm4key') or colPickMode == 1 and data.containsKey('sm4key')))">
-                    a.sm4key,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceCode') or colPickMode == 1 and data.containsKey('serviceCode')))">
-                    a.serviceCode,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('enabled') or colPickMode == 1 and data.containsKey('enabled')))">
-                    a.enabled,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
-                    a.remark,
-                </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>
+            <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('appid') or colPickMode == 1 and data.containsKey('appid')))">
+                a.appid,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('accessKey') or colPickMode == 1 and data.containsKey('accessKey')))">
+                a.access_key,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('privatKey') or colPickMode == 1 and data.containsKey('privatKey')))">
+                a.privat_key,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('key') or colPickMode == 1 and data.containsKey('key')))">
+                a.`key`,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('az400') or colPickMode == 1 and data.containsKey('az400')))">
+                a.az400,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sm4key') or colPickMode == 1 and data.containsKey('sm4key')))">
+                a.sm4key,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceCode') or colPickMode == 1 and data.containsKey('serviceCode')))">
+                a.serviceCode,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('enabled') or colPickMode == 1 and data.containsKey('enabled')))">
+                a.enabled,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
+                a.remark,
+            </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>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('busCode') or colPickMode == 1 and data.containsKey('busCode')))">
+                a.bus_code,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('orgName') or colPickMode == 1 and data.containsKey('orgName')))">
+                a.orgName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('address') or colPickMode == 1 and data.containsKey('address')))">
+                a.address,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('regionCode') or colPickMode == 1 and data.containsKey('regionCode')))">
+                a.regionCode,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('orgCode') or colPickMode == 1 and data.containsKey('orgCode')))">
+                a.orgCode,
+            </if>
         </trim>
     </sql>
     <!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
     <insert id="insert" parameterType="SocialSecuritySetEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_sys_social_security_set
-        (siteId,siteName,appid,access_key,privat_key,`key`,az400,sm4key,serviceCode,enabled,remark,createTime,createUserId,updateTime)
+        (siteId,siteName,appid,access_key,privat_key,`key`,az400,sm4key,serviceCode,enabled,remark,createTime,createUserId,updateTime,bus_code,orgName,address,regionCode,orgCode)
         VALUES
-        (#{siteId},#{siteName},#{appid},#{accessKey},#{privatKey},#{key},#{az400},#{sm4key},#{serviceCode},#{enabled},#{remark},#{createTime},#{createUserId},#{updateTime})
+        (#{siteId},#{siteName},#{appid},#{accessKey},#{privatKey},#{key},#{az400},#{sm4key},#{serviceCode},#{enabled},#{remark},#{createTime},#{createUserId},#{updateTime},#{busCode},#{orgName},#{address},#{regionCode},#{orgCode})
     </insert>
 
     <!-- 鎵归噺鏂板 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_sys_social_security_set
-        (siteId,siteName,appid,access_key,privat_key,`key`,az400,sm4key,serviceCode,enabled,remark,createTime,createUserId,updateTime)
+        (siteId,siteName,appid,access_key,privat_key,`key`,az400,sm4key,serviceCode,enabled,remark,createTime,createUserId,updateTime,bus_code,orgName,address,regionCode,orgCode)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.siteName},#{item.appid},#{item.accessKey},#{item.privatKey},#{item.key},#{item.az400},#{item.sm4key},#{item.serviceCode},#{item.enabled},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateTime})
+            (#{item.siteId},#{item.siteName},#{item.appid},#{item.accessKey},#{item.privatKey},#{item.key},#{item.az400},#{item.sm4key},#{item.serviceCode},#{item.enabled},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.busCode},#{item.orgName},#{item.address},#{item.regionCode},#{item.orgCode})
         </foreach>
     </insert>
 
@@ -147,6 +167,21 @@
             <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('busCode')) or (colPickMode==1 and !data.containsKey('busCode'))">
+                a.bus_code=#{data.busCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('orgName')) or (colPickMode==1 and !data.containsKey('orgName'))">
+                a.orgName=#{data.orgName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('address')) or (colPickMode==1 and !data.containsKey('address'))">
+                a.address=#{data.address},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('regionCode')) or (colPickMode==1 and !data.containsKey('regionCode'))">
+                a.regionCode=#{data.regionCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('orgCode')) or (colPickMode==1 and !data.containsKey('orgCode'))">
+                a.orgCode=#{data.orgCode},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -159,119 +194,154 @@
     <update id="updateBatch" parameterType="paramDto">
         update mortals_sys_social_security_set 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="appid=(case" suffix="ELSE appid end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('appid')) or (colPickMode==1 and !item.containsKey('appid'))">
-                            when a.id=#{item.id} then #{item.appid}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="access_key=(case" suffix="ELSE access_key end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('accessKey')) or (colPickMode==1 and !item.containsKey('accessKey'))">
-                            when a.id=#{item.id} then #{item.accessKey}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="privat_key=(case" suffix="ELSE privat_key end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('privatKey')) or (colPickMode==1 and !item.containsKey('privatKey'))">
-                            when a.id=#{item.id} then #{item.privatKey}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="`key`=(case" suffix="ELSE `key` end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('key')) or (colPickMode==1 and !item.containsKey('key'))">
-                            when a.id=#{item.id} then #{item.key}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="az400=(case" suffix="ELSE az400 end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('az400')) or (colPickMode==1 and !item.containsKey('az400'))">
-                            when a.id=#{item.id} then #{item.az400}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="sm4key=(case" suffix="ELSE sm4key end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('sm4key')) or (colPickMode==1 and !item.containsKey('sm4key'))">
-                            when a.id=#{item.id} then #{item.sm4key}
-                        </if>
-                    </foreach>
-                </trim>
-                <trim prefix="serviceCode=(case" suffix="ELSE serviceCode end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('serviceCode')) or (colPickMode==1 and !item.containsKey('serviceCode'))">
-                            when a.id=#{item.id} then #{item.serviceCode}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="enabled=(case" suffix="ELSE enabled end),">
-                            <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('enabled')) or (colPickMode==1 and !item.containsKey('enabled'))">
-                                        when a.id=#{item.id} then #{item.enabled}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('enabledIncrement')) or (colPickMode==1 and !item.containsKey('enabledIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.enabled,0) + #{item.enabledIncrement}
-                                    </when>
-                                </choose>
-                            </foreach>
-                        </trim>
-                <trim prefix="remark=(case" suffix="ELSE remark end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
-                            when a.id=#{item.id} then #{item.remark}
-                        </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="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="appid=(case" suffix="ELSE appid end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('appid')) or (colPickMode==1 and !item.containsKey('appid'))">
+                        when a.id=#{item.id} then #{item.appid}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="access_key=(case" suffix="ELSE access_key end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('accessKey')) or (colPickMode==1 and !item.containsKey('accessKey'))">
+                        when a.id=#{item.id} then #{item.accessKey}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="privat_key=(case" suffix="ELSE privat_key end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('privatKey')) or (colPickMode==1 and !item.containsKey('privatKey'))">
+                        when a.id=#{item.id} then #{item.privatKey}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="`key`=(case" suffix="ELSE `key` end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('key')) or (colPickMode==1 and !item.containsKey('key'))">
+                        when a.id=#{item.id} then #{item.key}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="az400=(case" suffix="ELSE az400 end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('az400')) or (colPickMode==1 and !item.containsKey('az400'))">
+                        when a.id=#{item.id} then #{item.az400}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="sm4key=(case" suffix="ELSE sm4key end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('sm4key')) or (colPickMode==1 and !item.containsKey('sm4key'))">
+                        when a.id=#{item.id} then #{item.sm4key}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="serviceCode=(case" suffix="ELSE serviceCode end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('serviceCode')) or (colPickMode==1 and !item.containsKey('serviceCode'))">
+                        when a.id=#{item.id} then #{item.serviceCode}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="enabled=(case" suffix="ELSE enabled end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('enabled')) or (colPickMode==1 and !item.containsKey('enabled'))">
+                            when a.id=#{item.id} then #{item.enabled}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('enabledIncrement')) or (colPickMode==1 and !item.containsKey('enabledIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.enabled,0) + #{item.enabledIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="remark=(case" suffix="ELSE remark end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
+                        when a.id=#{item.id} then #{item.remark}
+                    </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="bus_code=(case" suffix="ELSE bus_code end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('busCode')) or (colPickMode==1 and !item.containsKey('busCode'))">
+                        when a.id=#{item.id} then #{item.busCode}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="orgName=(case" suffix="ELSE orgName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('orgName')) or (colPickMode==1 and !item.containsKey('orgName'))">
+                        when a.id=#{item.id} then #{item.orgName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="address=(case" suffix="ELSE address end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('address')) or (colPickMode==1 and !item.containsKey('address'))">
+                        when a.id=#{item.id} then #{item.address}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="regionCode=(case" suffix="ELSE regionCode end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('regionCode')) or (colPickMode==1 and !item.containsKey('regionCode'))">
+                        when a.id=#{item.id} then #{item.regionCode}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="orgCode=(case" suffix="ELSE orgCode end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('orgCode')) or (colPickMode==1 and !item.containsKey('orgCode'))">
+                        when a.id=#{item.id} then #{item.orgCode}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -392,477 +462,607 @@
                 ${_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 test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null ">
+                ${_conditionType_} a.id = #{${_conditionParam_}.id}
             </if>
-            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
-                ${_conditionType_} a.id in
-                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.id == null">
+                ${_conditionType_} a.id is null
             </if>
-            <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
-                ${_conditionType_} a.id not in
-                <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+            ${_conditionType_} a.id in
+            <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
+            ${_conditionType_} a.id not in
+            <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+            ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+        </if>
+        <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.containsKey('idStart') and conditionParamRef.idStart != null">
-                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+            <if test="conditionParamRef.siteId == null">
+                ${_conditionType_} a.siteId is null
             </if>
-            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
-                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+            ${_conditionType_} a.siteId in
+            <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
+            ${_conditionType_} a.siteId not in
+            <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
+            ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+        </if>
+        <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>
+        <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
+            ${_conditionType_} a.siteName in
+            <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
+            ${_conditionType_} a.siteName not in
+            <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('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('appid')">
+            <if test="conditionParamRef.appid != null and conditionParamRef.appid != ''">
+                ${_conditionType_} a.appid like #{${_conditionParam_}.appid}
             </if>
-            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
-                ${_conditionType_} a.siteId in
-                <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.appid == null">
+                ${_conditionType_} a.appid is null
             </if>
-            <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
-                ${_conditionType_} a.siteId not in
-                <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('appidList') and conditionParamRef.appidList.size() > 0">
+            ${_conditionType_} a.appid in
+            <foreach collection="conditionParamRef.appidList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('appidNotList') and conditionParamRef.appidNotList.size() > 0">
+            ${_conditionType_} a.appid not in
+            <foreach collection="conditionParamRef.appidNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('accessKey')">
+            <if test="conditionParamRef.accessKey != null and conditionParamRef.accessKey != ''">
+                ${_conditionType_} a.access_key like #{${_conditionParam_}.accessKey}
+            </if>
+            <if test="conditionParamRef.accessKey == null">
+                ${_conditionType_} a.access_key is null
             </if>
-            <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
-                ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('accessKeyList') and conditionParamRef.accessKeyList.size() > 0">
+            ${_conditionType_} a.access_key in
+            <foreach collection="conditionParamRef.accessKeyList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('accessKeyNotList') and conditionParamRef.accessKeyNotList.size() > 0">
+            ${_conditionType_} a.access_key not in
+            <foreach collection="conditionParamRef.accessKeyNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('privatKey')">
+            <if test="conditionParamRef.privatKey != null and conditionParamRef.privatKey != ''">
+                ${_conditionType_} a.privat_key like #{${_conditionParam_}.privatKey}
             </if>
-            <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
-                ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+            <if test="conditionParamRef.privatKey == null">
+                ${_conditionType_} a.privat_key is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('privatKeyList') and conditionParamRef.privatKeyList.size() > 0">
+            ${_conditionType_} a.privat_key in
+            <foreach collection="conditionParamRef.privatKeyList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('privatKeyNotList') and conditionParamRef.privatKeyNotList.size() > 0">
+            ${_conditionType_} a.privat_key not in
+            <foreach collection="conditionParamRef.privatKeyNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
+        <if test="conditionParamRef.containsKey('key')">
+            <if test="conditionParamRef.key != null and conditionParamRef.key != ''">
+                ${_conditionType_} a.`key` like #{${_conditionParam_}.key}
+            </if>
+            <if test="conditionParamRef.key == null">
+                ${_conditionType_} a.`key` is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('keyList') and conditionParamRef.keyList.size() > 0">
+            ${_conditionType_} a.`key` in
+            <foreach collection="conditionParamRef.keyList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('keyNotList') and conditionParamRef.keyNotList.size() > 0">
+            ${_conditionType_} a.`key` not in
+            <foreach collection="conditionParamRef.keyNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </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('az400')">
+            <if test="conditionParamRef.az400 != null and conditionParamRef.az400 != ''">
+                ${_conditionType_} a.az400 like #{${_conditionParam_}.az400}
             </if>
-            <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
-                ${_conditionType_} a.siteName in
-                <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.az400 == null">
+                ${_conditionType_} a.az400 is null
             </if>
-            <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
-                ${_conditionType_} a.siteName not in
-                <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('az400List') and conditionParamRef.az400List.size() > 0">
+            ${_conditionType_} a.az400 in
+            <foreach collection="conditionParamRef.az400List" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('az400NotList') and conditionParamRef.az400NotList.size() > 0">
+            ${_conditionType_} a.az400 not in
+            <foreach collection="conditionParamRef.az400NotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('sm4key')">
+            <if test="conditionParamRef.sm4key != null and conditionParamRef.sm4key != ''">
+                ${_conditionType_} a.sm4key like #{${_conditionParam_}.sm4key}
             </if>
+            <if test="conditionParamRef.sm4key == null">
+                ${_conditionType_} a.sm4key is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('sm4keyList') and conditionParamRef.sm4keyList.size() > 0">
+            ${_conditionType_} a.sm4key in
+            <foreach collection="conditionParamRef.sm4keyList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('sm4keyNotList') and conditionParamRef.sm4keyNotList.size() > 0">
+            ${_conditionType_} a.sm4key not in
+            <foreach collection="conditionParamRef.sm4keyNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('appid')">
-                <if test="conditionParamRef.appid != null and conditionParamRef.appid != ''">
-                    ${_conditionType_} a.appid like #{${_conditionParam_}.appid}
-                </if>
-                <if test="conditionParamRef.appid == null">
-                    ${_conditionType_} a.appid is null
-                </if>
+        <if test="conditionParamRef.containsKey('serviceCode')">
+            <if test="conditionParamRef.serviceCode != null and conditionParamRef.serviceCode != ''">
+                ${_conditionType_} a.serviceCode like #{${_conditionParam_}.serviceCode}
             </if>
-            <if test="conditionParamRef.containsKey('appidList') and conditionParamRef.appidList.size() > 0">
-                ${_conditionType_} a.appid in
-                <foreach collection="conditionParamRef.appidList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.serviceCode == null">
+                ${_conditionType_} a.serviceCode is null
             </if>
-            <if test="conditionParamRef.containsKey('appidNotList') and conditionParamRef.appidNotList.size() > 0">
-                ${_conditionType_} a.appid not in
-                <foreach collection="conditionParamRef.appidNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('serviceCodeList') and conditionParamRef.serviceCodeList.size() > 0">
+            ${_conditionType_} a.serviceCode in
+            <foreach collection="conditionParamRef.serviceCodeList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('serviceCodeNotList') and conditionParamRef.serviceCodeNotList.size() > 0">
+            ${_conditionType_} a.serviceCode not in
+            <foreach collection="conditionParamRef.serviceCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('enabled')">
+            <if test="conditionParamRef.enabled != null ">
+                ${_conditionType_} a.enabled = #{${_conditionParam_}.enabled}
             </if>
-
-            <if test="conditionParamRef.containsKey('accessKey')">
-                <if test="conditionParamRef.accessKey != null and conditionParamRef.accessKey != ''">
-                    ${_conditionType_} a.access_key like #{${_conditionParam_}.accessKey}
-                </if>
-                <if test="conditionParamRef.accessKey == null">
-                    ${_conditionType_} a.access_key is null
-                </if>
+            <if test="conditionParamRef.enabled == null">
+                ${_conditionType_} a.enabled is null
             </if>
-            <if test="conditionParamRef.containsKey('accessKeyList') and conditionParamRef.accessKeyList.size() > 0">
-                ${_conditionType_} a.access_key in
-                <foreach collection="conditionParamRef.accessKeyList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('enabledList') and conditionParamRef.enabledList.size() > 0">
+            ${_conditionType_} a.enabled in
+            <foreach collection="conditionParamRef.enabledList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('enabledNotList') and conditionParamRef.enabledNotList.size() > 0">
+            ${_conditionType_} a.enabled not in
+            <foreach collection="conditionParamRef.enabledNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('enabledStart') and conditionParamRef.enabledStart != null">
+            ${_conditionType_} a.enabled <![CDATA[ >= ]]> #{${_conditionParam_}.enabledStart}
+        </if>
+        <if test="conditionParamRef.containsKey('enabledEnd') and conditionParamRef.enabledEnd != null">
+            ${_conditionType_} a.enabled <![CDATA[ <= ]]> #{${_conditionParam_}.enabledEnd}
+        </if>
+
+
+        <if test="conditionParamRef.containsKey('remark')">
+            <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
+                ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
             </if>
-            <if test="conditionParamRef.containsKey('accessKeyNotList') and conditionParamRef.accessKeyNotList.size() > 0">
-                ${_conditionType_} a.access_key not in
-                <foreach collection="conditionParamRef.accessKeyNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.remark == null">
+                ${_conditionType_} a.remark is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
+            ${_conditionType_} a.remark in
+            <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
+            ${_conditionType_} a.remark not in
+            <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('privatKey')">
-                <if test="conditionParamRef.privatKey != null and conditionParamRef.privatKey != ''">
-                    ${_conditionType_} a.privat_key like #{${_conditionParam_}.privatKey}
-                </if>
-                <if test="conditionParamRef.privatKey == null">
-                    ${_conditionType_} a.privat_key is null
-                </if>
+        <if test="conditionParamRef.containsKey('createTime')">
+            <if test="conditionParamRef.createTime != null ">
+                ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
             </if>
-            <if test="conditionParamRef.containsKey('privatKeyList') and conditionParamRef.privatKeyList.size() > 0">
-                ${_conditionType_} a.privat_key in
-                <foreach collection="conditionParamRef.privatKeyList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.createTime == null">
+                ${_conditionType_} a.createTime is null
             </if>
-            <if test="conditionParamRef.containsKey('privatKeyNotList') and conditionParamRef.privatKeyNotList.size() > 0">
-                ${_conditionType_} a.privat_key not in
-                <foreach collection="conditionParamRef.privatKeyNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        </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('key')">
-                <if test="conditionParamRef.key != null and conditionParamRef.key != ''">
-                    ${_conditionType_} a.`key` like #{${_conditionParam_}.key}
-                </if>
-                <if test="conditionParamRef.key == null">
-                    ${_conditionType_} a.`key` is null
-                </if>
+            <if test="conditionParamRef.createUserId == null">
+                ${_conditionType_} a.createUserId is null
             </if>
-            <if test="conditionParamRef.containsKey('keyList') and conditionParamRef.keyList.size() > 0">
-                ${_conditionType_} a.`key` in
-                <foreach collection="conditionParamRef.keyList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+            ${_conditionType_} a.createUserId in
+            <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
+            ${_conditionType_} a.createUserId not in
+            <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+            ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+            ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+        </if>
+
+
+        <if test="conditionParamRef.containsKey('updateTime')">
+            <if test="conditionParamRef.updateTime != null ">
+                ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
             </if>
-            <if test="conditionParamRef.containsKey('keyNotList') and conditionParamRef.keyNotList.size() > 0">
-                ${_conditionType_} a.`key` not in
-                <foreach collection="conditionParamRef.keyNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <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>
 
-            <if test="conditionParamRef.containsKey('az400')">
-                <if test="conditionParamRef.az400 != null and conditionParamRef.az400 != ''">
-                    ${_conditionType_} a.az400 like #{${_conditionParam_}.az400}
-                </if>
-                <if test="conditionParamRef.az400 == null">
-                    ${_conditionType_} a.az400 is null
-                </if>
+        <if test="conditionParamRef.containsKey('busCode')">
+            <if test="conditionParamRef.busCode != null and conditionParamRef.busCode != ''">
+                ${_conditionType_} a.bus_code like #{${_conditionParam_}.busCode}
             </if>
-            <if test="conditionParamRef.containsKey('az400List') and conditionParamRef.az400List.size() > 0">
-                ${_conditionType_} a.az400 in
-                <foreach collection="conditionParamRef.az400List" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.busCode == null">
+                ${_conditionType_} a.bus_code is null
             </if>
-            <if test="conditionParamRef.containsKey('az400NotList') and conditionParamRef.az400NotList.size() > 0">
-                ${_conditionType_} a.az400 not in
-                <foreach collection="conditionParamRef.az400NotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('busCodeList') and conditionParamRef.busCodeList.size() > 0">
+            ${_conditionType_} a.bus_code in
+            <foreach collection="conditionParamRef.busCodeList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('busCodeNotList') and conditionParamRef.busCodeNotList.size() > 0">
+            ${_conditionType_} a.bus_code not in
+            <foreach collection="conditionParamRef.busCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('orgName')">
+            <if test="conditionParamRef.orgName != null and conditionParamRef.orgName != ''">
+                ${_conditionType_} a.orgName like #{${_conditionParam_}.orgName}
+            </if>
+            <if test="conditionParamRef.orgName == null">
+                ${_conditionType_} a.orgName is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('orgNameList') and conditionParamRef.orgNameList.size() > 0">
+            ${_conditionType_} a.orgName in
+            <foreach collection="conditionParamRef.orgNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('orgNameNotList') and conditionParamRef.orgNameNotList.size() > 0">
+            ${_conditionType_} a.orgName not in
+            <foreach collection="conditionParamRef.orgNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('sm4key')">
-                <if test="conditionParamRef.sm4key != null and conditionParamRef.sm4key != ''">
-                    ${_conditionType_} a.sm4key like #{${_conditionParam_}.sm4key}
-                </if>
-                <if test="conditionParamRef.sm4key == null">
-                    ${_conditionType_} a.sm4key is null
-                </if>
+        <if test="conditionParamRef.containsKey('address')">
+            <if test="conditionParamRef.address != null and conditionParamRef.address != ''">
+                ${_conditionType_} a.address like #{${_conditionParam_}.address}
             </if>
-            <if test="conditionParamRef.containsKey('sm4keyList') and conditionParamRef.sm4keyList.size() > 0">
-                ${_conditionType_} a.sm4key in
-                <foreach collection="conditionParamRef.sm4keyList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.address == null">
+                ${_conditionType_} a.address is null
             </if>
-            <if test="conditionParamRef.containsKey('sm4keyNotList') and conditionParamRef.sm4keyNotList.size() > 0">
-                ${_conditionType_} a.sm4key not in
-                <foreach collection="conditionParamRef.sm4keyNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('addressList') and conditionParamRef.addressList.size() > 0">
+            ${_conditionType_} a.address in
+            <foreach collection="conditionParamRef.addressList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('addressNotList') and conditionParamRef.addressNotList.size() > 0">
+            ${_conditionType_} a.address not in
+            <foreach collection="conditionParamRef.addressNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('regionCode')">
+            <if test="conditionParamRef.regionCode != null and conditionParamRef.regionCode != ''">
+                ${_conditionType_} a.regionCode like #{${_conditionParam_}.regionCode}
+            </if>
+            <if test="conditionParamRef.regionCode == null">
+                ${_conditionType_} a.regionCode is null
             </if>
+        </if>
+        <if test="conditionParamRef.containsKey('regionCodeList') and conditionParamRef.regionCodeList.size() > 0">
+            ${_conditionType_} a.regionCode in
+            <foreach collection="conditionParamRef.regionCodeList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('regionCodeNotList') and conditionParamRef.regionCodeNotList.size() > 0">
+            ${_conditionType_} a.regionCode not in
+            <foreach collection="conditionParamRef.regionCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
-            <if test="conditionParamRef.containsKey('serviceCode')">
-                <if test="conditionParamRef.serviceCode != null and conditionParamRef.serviceCode != ''">
-                    ${_conditionType_} a.serviceCode like #{${_conditionParam_}.serviceCode}
-                </if>
-                <if test="conditionParamRef.serviceCode == null">
-                    ${_conditionType_} a.serviceCode is null
-                </if>
+        <if test="conditionParamRef.containsKey('orgCode')">
+            <if test="conditionParamRef.orgCode != null and conditionParamRef.orgCode != ''">
+                ${_conditionType_} a.orgCode like #{${_conditionParam_}.orgCode}
             </if>
-            <if test="conditionParamRef.containsKey('serviceCodeList') and conditionParamRef.serviceCodeList.size() > 0">
-                ${_conditionType_} a.serviceCode in
-                <foreach collection="conditionParamRef.serviceCodeList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.orgCode == null">
+                ${_conditionType_} a.orgCode is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('orgCodeList') and conditionParamRef.orgCodeList.size() > 0">
+            ${_conditionType_} a.orgCode in
+            <foreach collection="conditionParamRef.orgCodeList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('orgCodeNotList') and conditionParamRef.orgCodeNotList.size() > 0">
+            ${_conditionType_} a.orgCode not in
+            <foreach collection="conditionParamRef.orgCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                field(a.id,
+                <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
+                ,
             </if>
-            <if test="conditionParamRef.containsKey('serviceCodeNotList') and conditionParamRef.serviceCodeNotList.size() > 0">
-                ${_conditionType_} a.serviceCode not in
-                <foreach collection="conditionParamRef.serviceCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                field(a.siteId,
+                <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('enabled')">
-                <if test="conditionParamRef.enabled != null ">
-                    ${_conditionType_} a.enabled = #{${_conditionParam_}.enabled}
-                </if>
-                <if test="conditionParamRef.enabled == null">
-                    ${_conditionType_} a.enabled is null
-                </if>
+                ,
             </if>
             <if test="conditionParamRef.containsKey('enabledList') and conditionParamRef.enabledList.size() > 0">
-                ${_conditionType_} a.enabled in
-                <foreach collection="conditionParamRef.enabledList" open="(" close=")" index="index" item="item" separator=",">
+                field(a.enabled,
+                <foreach collection="conditionParamRef.enabledList" open="" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
+                ,
             </if>
-            <if test="conditionParamRef.containsKey('enabledNotList') and conditionParamRef.enabledNotList.size() > 0">
-                ${_conditionType_} a.enabled not in
-                <foreach collection="conditionParamRef.enabledNotList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                field(a.createUserId,
+                <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
+                ,
             </if>
-            <if test="conditionParamRef.containsKey('enabledStart') and conditionParamRef.enabledStart != null">
-                ${_conditionType_} a.enabled <![CDATA[ >= ]]> #{${_conditionParam_}.enabledStart}
-            </if>
-            <if test="conditionParamRef.containsKey('enabledEnd') and conditionParamRef.enabledEnd != null">
-                ${_conditionType_} a.enabled <![CDATA[ <= ]]> #{${_conditionParam_}.enabledEnd}
-            </if>
-
-
-            <if test="conditionParamRef.containsKey('remark')">
-                <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
-                    ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
-                </if>
-                <if test="conditionParamRef.remark == null">
-                    ${_conditionType_} a.remark is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
-                ${_conditionType_} a.remark in
-                <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                    a.${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                field(a.id,
+                <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
+                ,
             </if>
-            <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
-                ${_conditionType_} a.remark not in
-                <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                field(a.siteId,
+                <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
+                ,
             </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>
-            <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') and conditionParamRef.createUserIdList.size() > 0">
-                ${_conditionType_} a.createUserId in
-                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('enabledList') and conditionParamRef.enabledList.size() > 0">
+                field(a.enabled,
+                <foreach collection="conditionParamRef.enabledList" open="" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
+                ,
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
-                ${_conditionType_} a.createUserId not in
-                <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                field(a.createUserId,
+                <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
+                ,
             </if>
-            <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('updateTime')">
-                <if test="conditionParamRef.updateTime != null ">
-                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+            <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="conditionParamRef.updateTime == null">
-                    ${_conditionType_} a.updateTime is null
+                <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('appid')">
+                    a.appid
+                    <if test='orderCol.appid != null and "DESC".equalsIgnoreCase(orderCol.appid)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('accessKey')">
+                    a.access_key
+                    <if test='orderCol.accessKey != null and "DESC".equalsIgnoreCase(orderCol.accessKey)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('privatKey')">
+                    a.privat_key
+                    <if test='orderCol.privatKey != null and "DESC".equalsIgnoreCase(orderCol.privatKey)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('key')">
+                    a.`key`
+                    <if test='orderCol.key != null and "DESC".equalsIgnoreCase(orderCol.key)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('az400')">
+                    a.az400
+                    <if test='orderCol.az400 != null and "DESC".equalsIgnoreCase(orderCol.az400)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('sm4key')">
+                    a.sm4key
+                    <if test='orderCol.sm4key != null and "DESC".equalsIgnoreCase(orderCol.sm4key)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('serviceCode')">
+                    a.serviceCode
+                    <if test='orderCol.serviceCode != null and "DESC".equalsIgnoreCase(orderCol.serviceCode)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('enabled')">
+                    a.enabled
+                    <if test='orderCol.enabled != null and "DESC".equalsIgnoreCase(orderCol.enabled)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('remark')">
+                    a.remark
+                    <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>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('busCode')">
+                    a.bus_code
+                    <if test='orderCol.busCode != null and "DESC".equalsIgnoreCase(orderCol.busCode)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('orgName')">
+                    a.orgName
+                    <if test='orderCol.orgName != null and "DESC".equalsIgnoreCase(orderCol.orgName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('address')">
+                    a.address
+                    <if test='orderCol.address != null and "DESC".equalsIgnoreCase(orderCol.address)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('regionCode')">
+                    a.regionCode
+                    <if test='orderCol.regionCode != null and "DESC".equalsIgnoreCase(orderCol.regionCode)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('orgCode')">
+                    a.orgCode
+                    <if test='orderCol.orgCode != null and "DESC".equalsIgnoreCase(orderCol.orgCode)'>DESC</if>
+                    ,
                 </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
-                    <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
-                        field(a.id,
-                        <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
-                    <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
-                        field(a.siteId,
-                        <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
-                    <if test="conditionParamRef.containsKey('enabledList') and conditionParamRef.enabledList.size() > 0">
-                        field(a.enabled,
-                        <foreach collection="conditionParamRef.enabledList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
-                    <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
-                        field(a.createUserId,
-                        <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
-            <trim suffixOverrides=","  suffix="">
-                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                     a.${item.colName} ${item.sortKind}
-                </foreach>
-            </trim>
-        </if>
-        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
-            order by
-                    <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
-                        field(a.id,
-                        <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
-                    <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
-                        field(a.siteId,
-                        <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
-                    <if test="conditionParamRef.containsKey('enabledList') and conditionParamRef.enabledList.size() > 0">
-                        field(a.enabled,
-                        <foreach collection="conditionParamRef.enabledList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
-                    <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
-                        field(a.createUserId,
-                        <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
-                            #{item}
-                        </foreach>
-                        ,
-                    </if>
-            <trim suffixOverrides=","  suffix="">
-                    <if test="orderCol.containsKey('id')">
-                        a.id
-                        <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('appid')">
-                        a.appid
-                        <if test='orderCol.appid != null and "DESC".equalsIgnoreCase(orderCol.appid)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('accessKey')">
-                        a.access_key
-                        <if test='orderCol.accessKey != null and "DESC".equalsIgnoreCase(orderCol.accessKey)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('privatKey')">
-                        a.privat_key
-                        <if test='orderCol.privatKey != null and "DESC".equalsIgnoreCase(orderCol.privatKey)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('key')">
-                        a.`key`
-                        <if test='orderCol.key != null and "DESC".equalsIgnoreCase(orderCol.key)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('az400')">
-                        a.az400
-                        <if test='orderCol.az400 != null and "DESC".equalsIgnoreCase(orderCol.az400)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('sm4key')">
-                        a.sm4key
-                        <if test='orderCol.sm4key != null and "DESC".equalsIgnoreCase(orderCol.sm4key)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('serviceCode')">
-                        a.serviceCode
-                        <if test='orderCol.serviceCode != null and "DESC".equalsIgnoreCase(orderCol.serviceCode)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('enabled')">
-                        a.enabled
-                        <if test='orderCol.enabled != null and "DESC".equalsIgnoreCase(orderCol.enabled)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('remark')">
-                        a.remark
-                        <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>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>