From 20389c03d5ceb1c42ecd7da2f4733394434842e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com> Date: Fri, 22 Mar 2024 01:11:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E8=AF=95=E6=9C=BA?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhx/daemon/task/SyncMatterTaskImpl.java | 27 +- .../matter/service/MatterExtService.java | 5 +- .../service/impl/MatterExtServiceImpl.java | 6 +- .../service/impl/MatterServiceImpl.java | 2 +- .../config/mybatis-sqlmap-config.xml | 2 +- .../resources/config/spring-config-core.xml | 4 +- .../sqlmap/module/matter/MatterMapper.xml | 447 +++++++++++------- 7 files changed, 278 insertions(+), 215 deletions(-) diff --git a/base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncMatterTaskImpl.java b/base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncMatterTaskImpl.java index 4241c518..76c8bce5 100644 --- a/base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncMatterTaskImpl.java +++ b/base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncMatterTaskImpl.java @@ -1,42 +1,19 @@ package com.mortals.xhx.daemon.task; -import cn.hutool.core.collection.ListUtil; -import com.alibaba.fastjson.JSON; -import com.mortals.framework.common.Rest; import com.mortals.framework.exception.AppException; -import com.mortals.framework.model.Context; -import com.mortals.framework.service.ICacheService; import com.mortals.framework.service.ITask; import com.mortals.framework.service.ITaskExcuteService; -import com.mortals.xhx.common.code.DxTypeEnum; -import com.mortals.xhx.common.code.SourceEnum; -import com.mortals.xhx.common.code.YesNoEnum; -import com.mortals.xhx.common.keys.RedisCacheKeys; -import com.mortals.xhx.module.area.model.AreaEntity; -import com.mortals.xhx.module.area.service.AreaService; import com.mortals.xhx.module.dept.service.DeptService; -import com.mortals.xhx.module.matter.model.MatterEntity; -import com.mortals.xhx.module.matter.model.MatterQuery; import com.mortals.xhx.module.matter.service.MatterExtService; -import com.mortals.xhx.module.matter.service.MatterService; import com.mortals.xhx.module.site.model.SiteEntity; -import com.mortals.xhx.module.site.model.SiteMatterEntity; -import com.mortals.xhx.module.site.model.SiteMatterQuery; -import com.mortals.xhx.module.site.model.SiteQuery; import com.mortals.xhx.module.site.service.SiteMatterService; import com.mortals.xhx.module.site.service.SiteService; -import com.mortals.xhx.module.site.service.SiteThemeMatterService; -import com.mortals.xhx.module.site.service.SiteThemeService; import lombok.extern.slf4j.Slf4j; -import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.util.ObjectUtils; import org.springframework.util.StopWatch; -import java.util.Date; import java.util.List; -import java.util.stream.Collectors; /** * 鍚屾鍏ㄩ儴绔欑偣浜嬮」 @@ -75,7 +52,7 @@ public class SyncMatterTaskImpl implements ITaskExcuteService { log.info("寮€濮嬪悓姝ヤ簨椤�==銆媨}", siteEntity.getSiteName()); stopWatch.start("寮€濮嬪悓姝ヤ簨椤规柟娉�"); - matterExtService.doMatterBySiteId(siteEntity, null); + matterExtService.syncMatterBySiteId(siteEntity, null); stopWatch.stop(); log.info("鍚屾浜嬮」瀹屾垚,鑰楁椂锛歿}s", stopWatch.getLastTaskTimeMillis() / 1000); @@ -87,7 +64,7 @@ public class SyncMatterTaskImpl implements ITaskExcuteService { //鍚屾涓婚 stopWatch.start("寮€濮嬪悓姝ヤ富棰樹簨椤�"); - matterExtService.doMatterThemeBySiteId(siteEntity, null); + matterExtService.syncMatterThemeBySiteId(siteEntity, null); stopWatch.stop(); log.info("鍚屾涓婚浜嬮」瀹屾垚,鑰楁椂锛歿}s", stopWatch.getLastTaskTimeMillis() / 1000); } diff --git a/base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterExtService.java b/base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterExtService.java index 91e71297..18576974 100644 --- a/base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterExtService.java +++ b/base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterExtService.java @@ -2,7 +2,6 @@ package com.mortals.xhx.module.matter.service; import com.mortals.framework.common.Rest; import com.mortals.framework.model.Context; import com.mortals.framework.service.ICRUDService; -import com.mortals.xhx.module.matter.dao.MatterExtDao; import com.mortals.xhx.module.matter.model.MatterExtEntity; import com.mortals.xhx.module.site.model.SiteEntity; @@ -17,10 +16,10 @@ import com.mortals.xhx.module.site.model.SiteEntity; public interface MatterExtService extends ICRUDService<MatterExtEntity,Long>{ - Rest<String> doMatterBySiteId(SiteEntity siteEntity, Context context); + Rest<String> syncMatterBySiteId(SiteEntity siteEntity, Context context); - Rest<String> doMatterThemeBySiteId(SiteEntity siteEntity, Context context); + Rest<String> syncMatterThemeBySiteId(SiteEntity siteEntity, Context context); void deleteByMatterId(Long matterId, Context context); diff --git a/base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterExtServiceImpl.java b/base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterExtServiceImpl.java index 37271df3..a2a334ba 100644 --- a/base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterExtServiceImpl.java +++ b/base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterExtServiceImpl.java @@ -75,7 +75,7 @@ public class MatterExtServiceImpl extends AbstractCRUDServiceImpl<MatterExtDao, * @return */ @Override - public Rest<String> doMatterBySiteId(SiteEntity siteEntity, Context context) { + public Rest<String> syncMatterBySiteId(SiteEntity siteEntity, Context context) { AreaEntity areaEntity = areaService.getCache(siteEntity.getAreaCode()); List<DeptEntity> deptEntities = deptService.find(new DeptQuery().siteId(siteEntity.getId()).source(SourceEnum.鏀垮姟缃�.getValue())); List<MatterEntity> govMatterList = deptEntities.parallelStream().flatMap(deptEntity -> { @@ -130,6 +130,8 @@ public class MatterExtServiceImpl extends AbstractCRUDServiceImpl<MatterExtDao, for (MatterEntity matterEntity : matterList) { Rest<String> rest = matterService.buildMatterDetail(matterEntity, null); if (rest.getCode() == YesNoEnum.YES.getValue()) { + // log.info("鏇存柊璇︾粏浜嬮」==>{},id===>{},localVersion===>{}", matterEntity.getMatterName(),matterEntity.getId(),matterEntity.getMatterEdition()); + //matterEntity.setUrl(null); matterEntity.setUpdateTime(new Date()); matterService.update(matterEntity, null); } @@ -145,7 +147,7 @@ public class MatterExtServiceImpl extends AbstractCRUDServiceImpl<MatterExtDao, * @return */ @Override - public Rest<String> doMatterThemeBySiteId(SiteEntity siteEntity, Context context) { + public Rest<String> syncMatterThemeBySiteId(SiteEntity siteEntity, Context context) { AreaEntity areaEntity = areaService.getCache(siteEntity.getAreaCode()); //鍒ゆ柇绔欑偣鍖哄煙涔¢晣鎯呭喌 if (areaEntity.getAreaLevel() <= 3) { diff --git a/base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java b/base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java index 9b6cffc8..75d52f44 100644 --- a/base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java +++ b/base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java @@ -1067,7 +1067,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter // return Rest.fail("鏈湴浜嬮」鐗堟湰澶т簬绛変簬杩滅锛屼笉闇€瑕佹洿鏂帮紒"); } - log.info("鏇存柊璇︾粏浜嬮」==>{},id===>{},localVersion===>{},newVersion==>{}", matterEntity.getMatterName(),matterEntity.getId(),matterEntity.getMatterEdition(), matterEditionRemote); + // log.info("鏇存柊璇︾粏浜嬮」==>{},id===>{},localVersion===>{},newVersion==>{}", matterEntity.getMatterName(),matterEntity.getId(),matterEntity.getMatterEdition(), matterEditionRemote); //鏇存柊閮ㄩ棬淇℃伅 DeptEntity extCache = deptService.getExtCache(matterEntity.getDeptCode()); matterEntity.setDeptName(extCache == null ? "" : extCache.getName()); diff --git a/base-manager/src/main/resources/config/mybatis-sqlmap-config.xml b/base-manager/src/main/resources/config/mybatis-sqlmap-config.xml index 697d2da7..ab4b66f6 100644 --- a/base-manager/src/main/resources/config/mybatis-sqlmap-config.xml +++ b/base-manager/src/main/resources/config/mybatis-sqlmap-config.xml @@ -18,7 +18,7 @@ <property name="showSql" value="MySql" /> </plugin> <plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor"> - <property name="enableExecutorTime" value="true" /> + <property name="enableExecutorTime" value="false" /> <property name="showSql" value="false" /> </plugin> </plugins> diff --git a/base-manager/src/main/resources/config/spring-config-core.xml b/base-manager/src/main/resources/config/spring-config-core.xml index a755ed29..ccd42526 100644 --- a/base-manager/src/main/resources/config/spring-config-core.xml +++ b/base-manager/src/main/resources/config/spring-config-core.xml @@ -30,8 +30,8 @@ <tx:method name="update*" propagation="REQUIRED" rollback-for="com.mortals.framework.exception.AppException" /> <tx:method name="modify*" propagation="REQUIRED" rollback-for="com.mortals.framework.exception.AppException" /> <tx:method name="execute*" propagation="REQUIRED" rollback-for="com.mortals.framework.exception.AppException" /> - <tx:method name="excute*" propagation="REQUIRED" rollback-for="com.mortals.framework.exception.AppException" /> - <tx:method name="start*" propagation="REQUIRED" rollback-for="com.mortals.framework.exception.AppException" /> + <!--<tx:method name="excute*" propagation="REQUIRED" rollback-for="com.mortals.framework.exception.AppException" /> + --><tx:method name="start*" propagation="REQUIRED" rollback-for="com.mortals.framework.exception.AppException" /> <tx:method name="increment*" propagation="REQUIRED" rollback-for="com.mortals.framework.exception.AppException" /> <tx:method name="do*" propagation="REQUIRED" rollback-for="com.mortals.framework.exception.AppException" /> <tx:method name="audit*" propagation="REQUIRED" rollback-for="com.mortals.framework.exception.AppException" /> diff --git a/base-manager/src/main/resources/sqlmap/module/matter/MatterMapper.xml b/base-manager/src/main/resources/sqlmap/module/matter/MatterMapper.xml index b284cefc..188ac835 100644 --- a/base-manager/src/main/resources/sqlmap/module/matter/MatterMapper.xml +++ b/base-manager/src/main/resources/sqlmap/module/matter/MatterMapper.xml @@ -84,22 +84,7 @@ <result property="updateTime" column="updateTime" /> <result property="evaluationUrl" column="evaluationUrl" /> <result property="netApplyUrl" column="netApplyUrl" /> - <!-- <collection property="matterExtList" column="id" ofType="MatterExtEntity" javaType="ArrayList" select="getMatterExtByMatterId"></collection>--> - </resultMap> - <resultMap type="MatterExtEntity" id="MatterExtEntity-Map"> - <result property="id" column="id" /> - <result property="matterId" column="matterId" /> - <result property="matterCode" column="matterCode" /> - <result property="matterName" column="matterName" /> - <result property="fieldCode" column="fieldCode" /> - <result property="fieldName" column="fieldName" /> - <result property="fieldValue" column="fieldValue" /> - <result property="fieldType" column="fieldType" /> - <result property="fieldOrderNo" column="fieldOrderNo" /> - <result property="source" column="source" /> - <result property="createTime" column="createTime" /> - <result property="createUserId" column="createUserId" /> - <result property="updateTime" column="updateTime" /> + </resultMap> @@ -345,12 +330,6 @@ </if> </trim> </sql> - <!-- 瀛愯〃鎵€鏈夊垪 --> - <sql id="_columns_sub"> - <trim suffixOverrides="," suffix=""> - b.id,b.matterId,b.matterCode,b.matterName,b.fieldCode,b.fieldName,b.fieldValue,b.fieldType,b.fieldOrderNo,b.source,b.createTime,b.createUserId,b.updateTime, - </trim> - </sql> <!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� --> <insert id="insert" parameterType="MatterEntity" useGeneratedKeys="true" keyProperty="id"> insert into mortals_sys_matter @@ -1283,14 +1262,6 @@ </trim> <include refid="_orderCols_"/> </select> - <!-- 鑾峰彇瀛愬垪琛� --> - <select id="getMatterExtByMatterId" parameterType="java.lang.Long" resultMap="MatterExtEntity-Map"> - select <include refid="_columns_sub"/> - from mortals_sys_matter_ext as b - <trim suffixOverrides="where" suffix=""> - where b.matterId = #{id} - </trim> - </select> @@ -1355,13 +1326,13 @@ ${_conditionType_} a.id is null </if> </if> - <if test="conditionParamRef.containsKey('idList')"> + <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0"> ${_conditionType_} a.id in <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('idNotList')"> + <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0"> ${_conditionType_} a.id not in <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1382,13 +1353,13 @@ ${_conditionType_} a.siteId is null </if> </if> - <if test="conditionParamRef.containsKey('siteIdList')"> + <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0"> ${_conditionType_} a.siteId in <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('siteIdNotList')"> + <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} @@ -1410,13 +1381,13 @@ ${_conditionType_} a.tid is null </if> </if> - <if test="conditionParamRef.containsKey('tidList')"> + <if test="conditionParamRef.containsKey('tidList') and conditionParamRef.tidList.size() > 0"> ${_conditionType_} a.tid in <foreach collection="conditionParamRef.tidList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('tidNotList')"> + <if test="conditionParamRef.containsKey('tidNotList') and conditionParamRef.tidNotList.size() > 0"> ${_conditionType_} a.tid not in <foreach collection="conditionParamRef.tidNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1431,13 +1402,13 @@ ${_conditionType_} a.tcode is null </if> </if> - <if test="conditionParamRef.containsKey('tcodeList')"> + <if test="conditionParamRef.containsKey('tcodeList') and conditionParamRef.tcodeList.size() > 0"> ${_conditionType_} a.tcode in <foreach collection="conditionParamRef.tcodeList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('tcodeNotList')"> + <if test="conditionParamRef.containsKey('tcodeNotList') and conditionParamRef.tcodeNotList.size() > 0"> ${_conditionType_} a.tcode not in <foreach collection="conditionParamRef.tcodeNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1452,13 +1423,13 @@ ${_conditionType_} a.tname is null </if> </if> - <if test="conditionParamRef.containsKey('tnameList')"> + <if test="conditionParamRef.containsKey('tnameList') and conditionParamRef.tnameList.size() > 0"> ${_conditionType_} a.tname in <foreach collection="conditionParamRef.tnameList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('tnameNotList')"> + <if test="conditionParamRef.containsKey('tnameNotList') and conditionParamRef.tnameNotList.size() > 0"> ${_conditionType_} a.tname not in <foreach collection="conditionParamRef.tnameNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1473,13 +1444,13 @@ ${_conditionType_} a.matterName is null </if> </if> - <if test="conditionParamRef.containsKey('matterNameList')"> + <if test="conditionParamRef.containsKey('matterNameList') and conditionParamRef.matterNameList.size() > 0"> ${_conditionType_} a.matterName in <foreach collection="conditionParamRef.matterNameList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('matterNameNotList')"> + <if test="conditionParamRef.containsKey('matterNameNotList') and conditionParamRef.matterNameNotList.size() > 0"> ${_conditionType_} a.matterName not in <foreach collection="conditionParamRef.matterNameNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1494,13 +1465,13 @@ ${_conditionType_} a.englishName is null </if> </if> - <if test="conditionParamRef.containsKey('englishNameList')"> + <if test="conditionParamRef.containsKey('englishNameList') and conditionParamRef.englishNameList.size() > 0"> ${_conditionType_} a.englishName in <foreach collection="conditionParamRef.englishNameList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('englishNameNotList')"> + <if test="conditionParamRef.containsKey('englishNameNotList') and conditionParamRef.englishNameNotList.size() > 0"> ${_conditionType_} a.englishName not in <foreach collection="conditionParamRef.englishNameNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1515,13 +1486,13 @@ ${_conditionType_} a.matterNo is null </if> </if> - <if test="conditionParamRef.containsKey('matterNoList')"> + <if test="conditionParamRef.containsKey('matterNoList') and conditionParamRef.matterNoList.size() > 0"> ${_conditionType_} a.matterNo in <foreach collection="conditionParamRef.matterNoList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('matterNoNotList')"> + <if test="conditionParamRef.containsKey('matterNoNotList') and conditionParamRef.matterNoNotList.size() > 0"> ${_conditionType_} a.matterNo not in <foreach collection="conditionParamRef.matterNoNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1536,13 +1507,13 @@ ${_conditionType_} a.areaCode is null </if> </if> - <if test="conditionParamRef.containsKey('areaCodeList')"> + <if test="conditionParamRef.containsKey('areaCodeList') and conditionParamRef.areaCodeList.size() > 0"> ${_conditionType_} a.areaCode in <foreach collection="conditionParamRef.areaCodeList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('areaCodeNotList')"> + <if test="conditionParamRef.containsKey('areaCodeNotList') and conditionParamRef.areaCodeNotList.size() > 0"> ${_conditionType_} a.areaCode not in <foreach collection="conditionParamRef.areaCodeNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1557,13 +1528,13 @@ ${_conditionType_} a.deptCode is null </if> </if> - <if test="conditionParamRef.containsKey('deptCodeList')"> + <if test="conditionParamRef.containsKey('deptCodeList') and conditionParamRef.deptCodeList.size() > 0"> ${_conditionType_} a.deptCode in <foreach collection="conditionParamRef.deptCodeList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('deptCodeNotList')"> + <if test="conditionParamRef.containsKey('deptCodeNotList') and conditionParamRef.deptCodeNotList.size() > 0"> ${_conditionType_} a.deptCode not in <foreach collection="conditionParamRef.deptCodeNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1578,13 +1549,13 @@ ${_conditionType_} a.deptName is null </if> </if> - <if test="conditionParamRef.containsKey('deptNameList')"> + <if test="conditionParamRef.containsKey('deptNameList') and conditionParamRef.deptNameList.size() > 0"> ${_conditionType_} a.deptName in <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('deptNameNotList')"> + <if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0"> ${_conditionType_} a.deptName not in <foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1599,13 +1570,13 @@ ${_conditionType_} a.powerCode is null </if> </if> - <if test="conditionParamRef.containsKey('powerCodeList')"> + <if test="conditionParamRef.containsKey('powerCodeList') and conditionParamRef.powerCodeList.size() > 0"> ${_conditionType_} a.powerCode in <foreach collection="conditionParamRef.powerCodeList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('powerCodeNotList')"> + <if test="conditionParamRef.containsKey('powerCodeNotList') and conditionParamRef.powerCodeNotList.size() > 0"> ${_conditionType_} a.powerCode not in <foreach collection="conditionParamRef.powerCodeNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1620,13 +1591,13 @@ ${_conditionType_} a.themeCode is null </if> </if> - <if test="conditionParamRef.containsKey('themeCodeList')"> + <if test="conditionParamRef.containsKey('themeCodeList') and conditionParamRef.themeCodeList.size() > 0"> ${_conditionType_} a.themeCode in <foreach collection="conditionParamRef.themeCodeList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('themeCodeNotList')"> + <if test="conditionParamRef.containsKey('themeCodeNotList') and conditionParamRef.themeCodeNotList.size() > 0"> ${_conditionType_} a.themeCode not in <foreach collection="conditionParamRef.themeCodeNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1641,13 +1612,13 @@ ${_conditionType_} a.usertypeCode is null </if> </if> - <if test="conditionParamRef.containsKey('usertypeCodeList')"> + <if test="conditionParamRef.containsKey('usertypeCodeList') and conditionParamRef.usertypeCodeList.size() > 0"> ${_conditionType_} a.usertypeCode in <foreach collection="conditionParamRef.usertypeCodeList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('usertypeCodeNotList')"> + <if test="conditionParamRef.containsKey('usertypeCodeNotList') and conditionParamRef.usertypeCodeNotList.size() > 0"> ${_conditionType_} a.usertypeCode not in <foreach collection="conditionParamRef.usertypeCodeNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1662,13 +1633,13 @@ ${_conditionType_} a.groupName is null </if> </if> - <if test="conditionParamRef.containsKey('groupNameList')"> + <if test="conditionParamRef.containsKey('groupNameList') and conditionParamRef.groupNameList.size() > 0"> ${_conditionType_} a.groupName in <foreach collection="conditionParamRef.groupNameList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('groupNameNotList')"> + <if test="conditionParamRef.containsKey('groupNameNotList') and conditionParamRef.groupNameNotList.size() > 0"> ${_conditionType_} a.groupName not in <foreach collection="conditionParamRef.groupNameNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1683,13 +1654,13 @@ ${_conditionType_} a.url is null </if> </if> - <if test="conditionParamRef.containsKey('urlList')"> + <if test="conditionParamRef.containsKey('urlList') and conditionParamRef.urlList.size() > 0"> ${_conditionType_} a.url in <foreach collection="conditionParamRef.urlList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('urlNotList')"> + <if test="conditionParamRef.containsKey('urlNotList') and conditionParamRef.urlNotList.size() > 0"> ${_conditionType_} a.url not in <foreach collection="conditionParamRef.urlNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1704,13 +1675,13 @@ ${_conditionType_} a.haveGetMatterInfo is null </if> </if> - <if test="conditionParamRef.containsKey('haveGetMatterInfoList')"> + <if test="conditionParamRef.containsKey('haveGetMatterInfoList') and conditionParamRef.haveGetMatterInfoList.size() > 0"> ${_conditionType_} a.haveGetMatterInfo in <foreach collection="conditionParamRef.haveGetMatterInfoList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('haveGetMatterInfoNotList')"> + <if test="conditionParamRef.containsKey('haveGetMatterInfoNotList') and conditionParamRef.haveGetMatterInfoNotList.size() > 0"> ${_conditionType_} a.haveGetMatterInfo not in <foreach collection="conditionParamRef.haveGetMatterInfoNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1725,13 +1696,13 @@ ${_conditionType_} a.belongDept is null </if> </if> - <if test="conditionParamRef.containsKey('belongDeptList')"> + <if test="conditionParamRef.containsKey('belongDeptList') and conditionParamRef.belongDeptList.size() > 0"> ${_conditionType_} a.belongDept in <foreach collection="conditionParamRef.belongDeptList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('belongDeptNotList')"> + <if test="conditionParamRef.containsKey('belongDeptNotList') and conditionParamRef.belongDeptNotList.size() > 0"> ${_conditionType_} a.belongDept not in <foreach collection="conditionParamRef.belongDeptNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1746,13 +1717,13 @@ ${_conditionType_} a.appoveObjectShow is null </if> </if> - <if test="conditionParamRef.containsKey('appoveObjectShowList')"> + <if test="conditionParamRef.containsKey('appoveObjectShowList') and conditionParamRef.appoveObjectShowList.size() > 0"> ${_conditionType_} a.appoveObjectShow in <foreach collection="conditionParamRef.appoveObjectShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('appoveObjectShowNotList')"> + <if test="conditionParamRef.containsKey('appoveObjectShowNotList') and conditionParamRef.appoveObjectShowNotList.size() > 0"> ${_conditionType_} a.appoveObjectShow not in <foreach collection="conditionParamRef.appoveObjectShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1767,13 +1738,13 @@ ${_conditionType_} a.operatScopeShow is null </if> </if> - <if test="conditionParamRef.containsKey('operatScopeShowList')"> + <if test="conditionParamRef.containsKey('operatScopeShowList') and conditionParamRef.operatScopeShowList.size() > 0"> ${_conditionType_} a.operatScopeShow in <foreach collection="conditionParamRef.operatScopeShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('operatScopeShowNotList')"> + <if test="conditionParamRef.containsKey('operatScopeShowNotList') and conditionParamRef.operatScopeShowNotList.size() > 0"> ${_conditionType_} a.operatScopeShow not in <foreach collection="conditionParamRef.operatScopeShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1788,13 +1759,13 @@ ${_conditionType_} a.appoveTimeLimitShow is null </if> </if> - <if test="conditionParamRef.containsKey('appoveTimeLimitShowList')"> + <if test="conditionParamRef.containsKey('appoveTimeLimitShowList') and conditionParamRef.appoveTimeLimitShowList.size() > 0"> ${_conditionType_} a.appoveTimeLimitShow in <foreach collection="conditionParamRef.appoveTimeLimitShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('appoveTimeLimitShowNotList')"> + <if test="conditionParamRef.containsKey('appoveTimeLimitShowNotList') and conditionParamRef.appoveTimeLimitShowNotList.size() > 0"> ${_conditionType_} a.appoveTimeLimitShow not in <foreach collection="conditionParamRef.appoveTimeLimitShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1809,13 +1780,13 @@ ${_conditionType_} a.handleType is null </if> </if> - <if test="conditionParamRef.containsKey('handleTypeList')"> + <if test="conditionParamRef.containsKey('handleTypeList') and conditionParamRef.handleTypeList.size() > 0"> ${_conditionType_} a.handleType in <foreach collection="conditionParamRef.handleTypeList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('handleTypeNotList')"> + <if test="conditionParamRef.containsKey('handleTypeNotList') and conditionParamRef.handleTypeNotList.size() > 0"> ${_conditionType_} a.handleType not in <foreach collection="conditionParamRef.handleTypeNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1830,13 +1801,13 @@ ${_conditionType_} a.legalTimeLimitShow is null </if> </if> - <if test="conditionParamRef.containsKey('legalTimeLimitShowList')"> + <if test="conditionParamRef.containsKey('legalTimeLimitShowList') and conditionParamRef.legalTimeLimitShowList.size() > 0"> ${_conditionType_} a.legalTimeLimitShow in <foreach collection="conditionParamRef.legalTimeLimitShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('legalTimeLimitShowNotList')"> + <if test="conditionParamRef.containsKey('legalTimeLimitShowNotList') and conditionParamRef.legalTimeLimitShowNotList.size() > 0"> ${_conditionType_} a.legalTimeLimitShow not in <foreach collection="conditionParamRef.legalTimeLimitShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1851,13 +1822,13 @@ ${_conditionType_} a.legalEndExplain is null </if> </if> - <if test="conditionParamRef.containsKey('legalEndExplainList')"> + <if test="conditionParamRef.containsKey('legalEndExplainList') and conditionParamRef.legalEndExplainList.size() > 0"> ${_conditionType_} a.legalEndExplain in <foreach collection="conditionParamRef.legalEndExplainList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('legalEndExplainNotList')"> + <if test="conditionParamRef.containsKey('legalEndExplainNotList') and conditionParamRef.legalEndExplainNotList.size() > 0"> ${_conditionType_} a.legalEndExplain not in <foreach collection="conditionParamRef.legalEndExplainNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1872,13 +1843,13 @@ ${_conditionType_} a.promiseTimeLimitShow is null </if> </if> - <if test="conditionParamRef.containsKey('promiseTimeLimitShowList')"> + <if test="conditionParamRef.containsKey('promiseTimeLimitShowList') and conditionParamRef.promiseTimeLimitShowList.size() > 0"> ${_conditionType_} a.promiseTimeLimitShow in <foreach collection="conditionParamRef.promiseTimeLimitShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('promiseTimeLimitShowNotList')"> + <if test="conditionParamRef.containsKey('promiseTimeLimitShowNotList') and conditionParamRef.promiseTimeLimitShowNotList.size() > 0"> ${_conditionType_} a.promiseTimeLimitShow not in <foreach collection="conditionParamRef.promiseTimeLimitShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1893,13 +1864,13 @@ ${_conditionType_} a.promiseEndExplain is null </if> </if> - <if test="conditionParamRef.containsKey('promiseEndExplainList')"> + <if test="conditionParamRef.containsKey('promiseEndExplainList') and conditionParamRef.promiseEndExplainList.size() > 0"> ${_conditionType_} a.promiseEndExplain in <foreach collection="conditionParamRef.promiseEndExplainList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('promiseEndExplainNotList')"> + <if test="conditionParamRef.containsKey('promiseEndExplainNotList') and conditionParamRef.promiseEndExplainNotList.size() > 0"> ${_conditionType_} a.promiseEndExplain not in <foreach collection="conditionParamRef.promiseEndExplainNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1914,13 +1885,13 @@ ${_conditionType_} a.isChargesShow is null </if> </if> - <if test="conditionParamRef.containsKey('isChargesShowList')"> + <if test="conditionParamRef.containsKey('isChargesShowList') and conditionParamRef.isChargesShowList.size() > 0"> ${_conditionType_} a.isChargesShow in <foreach collection="conditionParamRef.isChargesShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('isChargesShowNotList')"> + <if test="conditionParamRef.containsKey('isChargesShowNotList') and conditionParamRef.isChargesShowNotList.size() > 0"> ${_conditionType_} a.isChargesShow not in <foreach collection="conditionParamRef.isChargesShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1935,13 +1906,13 @@ ${_conditionType_} a.certificationLevelsShow is null </if> </if> - <if test="conditionParamRef.containsKey('certificationLevelsShowList')"> + <if test="conditionParamRef.containsKey('certificationLevelsShowList') and conditionParamRef.certificationLevelsShowList.size() > 0"> ${_conditionType_} a.certificationLevelsShow in <foreach collection="conditionParamRef.certificationLevelsShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('certificationLevelsShowNotList')"> + <if test="conditionParamRef.containsKey('certificationLevelsShowNotList') and conditionParamRef.certificationLevelsShowNotList.size() > 0"> ${_conditionType_} a.certificationLevelsShow not in <foreach collection="conditionParamRef.certificationLevelsShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -1986,13 +1957,13 @@ ${_conditionType_} a.specialProcedure is null </if> </if> - <if test="conditionParamRef.containsKey('specialProcedureList')"> + <if test="conditionParamRef.containsKey('specialProcedureList') and conditionParamRef.specialProcedureList.size() > 0"> ${_conditionType_} a.specialProcedure in <foreach collection="conditionParamRef.specialProcedureList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('specialProcedureNotList')"> + <if test="conditionParamRef.containsKey('specialProcedureNotList') and conditionParamRef.specialProcedureNotList.size() > 0"> ${_conditionType_} a.specialProcedure not in <foreach collection="conditionParamRef.specialProcedureNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2006,13 +1977,13 @@ ${_conditionType_} a.windowToTheSceneNum is null </if> </if> - <if test="conditionParamRef.containsKey('windowToTheSceneNumList')"> + <if test="conditionParamRef.containsKey('windowToTheSceneNumList') and conditionParamRef.windowToTheSceneNumList.size() > 0"> ${_conditionType_} a.windowToTheSceneNum in <foreach collection="conditionParamRef.windowToTheSceneNumList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('windowToTheSceneNumNotList')"> + <if test="conditionParamRef.containsKey('windowToTheSceneNumNotList') and conditionParamRef.windowToTheSceneNumNotList.size() > 0"> ${_conditionType_} a.windowToTheSceneNum not in <foreach collection="conditionParamRef.windowToTheSceneNumNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2034,13 +2005,13 @@ ${_conditionType_} a.isOnlineSubscribeShow is null </if> </if> - <if test="conditionParamRef.containsKey('isOnlineSubscribeShowList')"> + <if test="conditionParamRef.containsKey('isOnlineSubscribeShowList') and conditionParamRef.isOnlineSubscribeShowList.size() > 0"> ${_conditionType_} a.isOnlineSubscribeShow in <foreach collection="conditionParamRef.isOnlineSubscribeShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('isOnlineSubscribeShowNotList')"> + <if test="conditionParamRef.containsKey('isOnlineSubscribeShowNotList') and conditionParamRef.isOnlineSubscribeShowNotList.size() > 0"> ${_conditionType_} a.isOnlineSubscribeShow not in <foreach collection="conditionParamRef.isOnlineSubscribeShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2055,13 +2026,13 @@ ${_conditionType_} a.isExpressTakeShow is null </if> </if> - <if test="conditionParamRef.containsKey('isExpressTakeShowList')"> + <if test="conditionParamRef.containsKey('isExpressTakeShowList') and conditionParamRef.isExpressTakeShowList.size() > 0"> ${_conditionType_} a.isExpressTakeShow in <foreach collection="conditionParamRef.isExpressTakeShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('isExpressTakeShowNotList')"> + <if test="conditionParamRef.containsKey('isExpressTakeShowNotList') and conditionParamRef.isExpressTakeShowNotList.size() > 0"> ${_conditionType_} a.isExpressTakeShow not in <foreach collection="conditionParamRef.isExpressTakeShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2076,13 +2047,13 @@ ${_conditionType_} a.isProvinceAcquisitionShow is null </if> </if> - <if test="conditionParamRef.containsKey('isProvinceAcquisitionShowList')"> + <if test="conditionParamRef.containsKey('isProvinceAcquisitionShowList') and conditionParamRef.isProvinceAcquisitionShowList.size() > 0"> ${_conditionType_} a.isProvinceAcquisitionShow in <foreach collection="conditionParamRef.isProvinceAcquisitionShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('isProvinceAcquisitionShowNotList')"> + <if test="conditionParamRef.containsKey('isProvinceAcquisitionShowNotList') and conditionParamRef.isProvinceAcquisitionShowNotList.size() > 0"> ${_conditionType_} a.isProvinceAcquisitionShow not in <foreach collection="conditionParamRef.isProvinceAcquisitionShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2097,13 +2068,13 @@ ${_conditionType_} a.isApplyProvinceShow is null </if> </if> - <if test="conditionParamRef.containsKey('isApplyProvinceShowList')"> + <if test="conditionParamRef.containsKey('isApplyProvinceShowList') and conditionParamRef.isApplyProvinceShowList.size() > 0"> ${_conditionType_} a.isApplyProvinceShow in <foreach collection="conditionParamRef.isApplyProvinceShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('isApplyProvinceShowNotList')"> + <if test="conditionParamRef.containsKey('isApplyProvinceShowNotList') and conditionParamRef.isApplyProvinceShowNotList.size() > 0"> ${_conditionType_} a.isApplyProvinceShow not in <foreach collection="conditionParamRef.isApplyProvinceShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2118,13 +2089,13 @@ ${_conditionType_} a.mustSceneExplain is null </if> </if> - <if test="conditionParamRef.containsKey('mustSceneExplainList')"> + <if test="conditionParamRef.containsKey('mustSceneExplainList') and conditionParamRef.mustSceneExplainList.size() > 0"> ${_conditionType_} a.mustSceneExplain in <foreach collection="conditionParamRef.mustSceneExplainList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('mustSceneExplainNotList')"> + <if test="conditionParamRef.containsKey('mustSceneExplainNotList') and conditionParamRef.mustSceneExplainNotList.size() > 0"> ${_conditionType_} a.mustSceneExplain not in <foreach collection="conditionParamRef.mustSceneExplainNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2139,13 +2110,13 @@ ${_conditionType_} a.onlineType is null </if> </if> - <if test="conditionParamRef.containsKey('onlineTypeList')"> + <if test="conditionParamRef.containsKey('onlineTypeList') and conditionParamRef.onlineTypeList.size() > 0"> ${_conditionType_} a.onlineType in <foreach collection="conditionParamRef.onlineTypeList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('onlineTypeNotList')"> + <if test="conditionParamRef.containsKey('onlineTypeNotList') and conditionParamRef.onlineTypeNotList.size() > 0"> ${_conditionType_} a.onlineType not in <foreach collection="conditionParamRef.onlineTypeNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2159,13 +2130,13 @@ ${_conditionType_} a.onlineToTheSceneNum is null </if> </if> - <if test="conditionParamRef.containsKey('onlineToTheSceneNumList')"> + <if test="conditionParamRef.containsKey('onlineToTheSceneNumList') and conditionParamRef.onlineToTheSceneNumList.size() > 0"> ${_conditionType_} a.onlineToTheSceneNum in <foreach collection="conditionParamRef.onlineToTheSceneNumList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('onlineToTheSceneNumNotList')"> + <if test="conditionParamRef.containsKey('onlineToTheSceneNumNotList') and conditionParamRef.onlineToTheSceneNumNotList.size() > 0"> ${_conditionType_} a.onlineToTheSceneNum not in <foreach collection="conditionParamRef.onlineToTheSceneNumNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2187,13 +2158,13 @@ ${_conditionType_} a.onlineOperatDeep is null </if> </if> - <if test="conditionParamRef.containsKey('onlineOperatDeepList')"> + <if test="conditionParamRef.containsKey('onlineOperatDeepList') and conditionParamRef.onlineOperatDeepList.size() > 0"> ${_conditionType_} a.onlineOperatDeep in <foreach collection="conditionParamRef.onlineOperatDeepList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('onlineOperatDeepNotList')"> + <if test="conditionParamRef.containsKey('onlineOperatDeepNotList') and conditionParamRef.onlineOperatDeepNotList.size() > 0"> ${_conditionType_} a.onlineOperatDeep not in <foreach collection="conditionParamRef.onlineOperatDeepNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2208,13 +2179,13 @@ ${_conditionType_} a.isExpressTakeOnlineShow is null </if> </if> - <if test="conditionParamRef.containsKey('isExpressTakeOnlineShowList')"> + <if test="conditionParamRef.containsKey('isExpressTakeOnlineShowList') and conditionParamRef.isExpressTakeOnlineShowList.size() > 0"> ${_conditionType_} a.isExpressTakeOnlineShow in <foreach collection="conditionParamRef.isExpressTakeOnlineShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('isExpressTakeOnlineShowNotList')"> + <if test="conditionParamRef.containsKey('isExpressTakeOnlineShowNotList') and conditionParamRef.isExpressTakeOnlineShowNotList.size() > 0"> ${_conditionType_} a.isExpressTakeOnlineShow not in <foreach collection="conditionParamRef.isExpressTakeOnlineShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2229,13 +2200,13 @@ ${_conditionType_} a.isDoorTakeShow is null </if> </if> - <if test="conditionParamRef.containsKey('isDoorTakeShowList')"> + <if test="conditionParamRef.containsKey('isDoorTakeShowList') and conditionParamRef.isDoorTakeShowList.size() > 0"> ${_conditionType_} a.isDoorTakeShow in <foreach collection="conditionParamRef.isDoorTakeShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('isDoorTakeShowNotList')"> + <if test="conditionParamRef.containsKey('isDoorTakeShowNotList') and conditionParamRef.isDoorTakeShowNotList.size() > 0"> ${_conditionType_} a.isDoorTakeShow not in <foreach collection="conditionParamRef.isDoorTakeShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2250,13 +2221,13 @@ ${_conditionType_} a.onlineMustSceneExplain is null </if> </if> - <if test="conditionParamRef.containsKey('onlineMustSceneExplainList')"> + <if test="conditionParamRef.containsKey('onlineMustSceneExplainList') and conditionParamRef.onlineMustSceneExplainList.size() > 0"> ${_conditionType_} a.onlineMustSceneExplain in <foreach collection="conditionParamRef.onlineMustSceneExplainList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('onlineMustSceneExplainNotList')"> + <if test="conditionParamRef.containsKey('onlineMustSceneExplainNotList') and conditionParamRef.onlineMustSceneExplainNotList.size() > 0"> ${_conditionType_} a.onlineMustSceneExplain not in <foreach collection="conditionParamRef.onlineMustSceneExplainNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2271,13 +2242,13 @@ ${_conditionType_} a.performDeptType is null </if> </if> - <if test="conditionParamRef.containsKey('performDeptTypeList')"> + <if test="conditionParamRef.containsKey('performDeptTypeList') and conditionParamRef.performDeptTypeList.size() > 0"> ${_conditionType_} a.performDeptType in <foreach collection="conditionParamRef.performDeptTypeList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('performDeptTypeNotList')"> + <if test="conditionParamRef.containsKey('performDeptTypeNotList') and conditionParamRef.performDeptTypeNotList.size() > 0"> ${_conditionType_} a.performDeptType not in <foreach collection="conditionParamRef.performDeptTypeNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2292,13 +2263,13 @@ ${_conditionType_} a.matterEdition is null </if> </if> - <if test="conditionParamRef.containsKey('matterEditionList')"> + <if test="conditionParamRef.containsKey('matterEditionList') and conditionParamRef.matterEditionList.size() > 0"> ${_conditionType_} a.matterEdition in <foreach collection="conditionParamRef.matterEditionList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('matterEditionNotList')"> + <if test="conditionParamRef.containsKey('matterEditionNotList') and conditionParamRef.matterEditionNotList.size() > 0"> ${_conditionType_} a.matterEdition not in <foreach collection="conditionParamRef.matterEditionNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2313,13 +2284,13 @@ ${_conditionType_} a.eventTypeShow is null </if> </if> - <if test="conditionParamRef.containsKey('eventTypeShowList')"> + <if test="conditionParamRef.containsKey('eventTypeShowList') and conditionParamRef.eventTypeShowList.size() > 0"> ${_conditionType_} a.eventTypeShow in <foreach collection="conditionParamRef.eventTypeShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('eventTypeShowNotList')"> + <if test="conditionParamRef.containsKey('eventTypeShowNotList') and conditionParamRef.eventTypeShowNotList.size() > 0"> ${_conditionType_} a.eventTypeShow not in <foreach collection="conditionParamRef.eventTypeShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2334,13 +2305,13 @@ ${_conditionType_} a.performHierarchyShow is null </if> </if> - <if test="conditionParamRef.containsKey('performHierarchyShowList')"> + <if test="conditionParamRef.containsKey('performHierarchyShowList') and conditionParamRef.performHierarchyShowList.size() > 0"> ${_conditionType_} a.performHierarchyShow in <foreach collection="conditionParamRef.performHierarchyShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('performHierarchyShowNotList')"> + <if test="conditionParamRef.containsKey('performHierarchyShowNotList') and conditionParamRef.performHierarchyShowNotList.size() > 0"> ${_conditionType_} a.performHierarchyShow not in <foreach collection="conditionParamRef.performHierarchyShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2355,13 +2326,13 @@ ${_conditionType_} a.powerSourceShow is null </if> </if> - <if test="conditionParamRef.containsKey('powerSourceShowList')"> + <if test="conditionParamRef.containsKey('powerSourceShowList') and conditionParamRef.powerSourceShowList.size() > 0"> ${_conditionType_} a.powerSourceShow in <foreach collection="conditionParamRef.powerSourceShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('powerSourceShowNotList')"> + <if test="conditionParamRef.containsKey('powerSourceShowNotList') and conditionParamRef.powerSourceShowNotList.size() > 0"> ${_conditionType_} a.powerSourceShow not in <foreach collection="conditionParamRef.powerSourceShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2376,13 +2347,13 @@ ${_conditionType_} a.performDeptTypeShow is null </if> </if> - <if test="conditionParamRef.containsKey('performDeptTypeShowList')"> + <if test="conditionParamRef.containsKey('performDeptTypeShowList') and conditionParamRef.performDeptTypeShowList.size() > 0"> ${_conditionType_} a.performDeptTypeShow in <foreach collection="conditionParamRef.performDeptTypeShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('performDeptTypeShowNotList')"> + <if test="conditionParamRef.containsKey('performDeptTypeShowNotList') and conditionParamRef.performDeptTypeShowNotList.size() > 0"> ${_conditionType_} a.performDeptTypeShow not in <foreach collection="conditionParamRef.performDeptTypeShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2397,13 +2368,13 @@ ${_conditionType_} a.goveServiceCenterShow is null </if> </if> - <if test="conditionParamRef.containsKey('goveServiceCenterShowList')"> + <if test="conditionParamRef.containsKey('goveServiceCenterShowList') and conditionParamRef.goveServiceCenterShowList.size() > 0"> ${_conditionType_} a.goveServiceCenterShow in <foreach collection="conditionParamRef.goveServiceCenterShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('goveServiceCenterShowNotList')"> + <if test="conditionParamRef.containsKey('goveServiceCenterShowNotList') and conditionParamRef.goveServiceCenterShowNotList.size() > 0"> ${_conditionType_} a.goveServiceCenterShow not in <foreach collection="conditionParamRef.goveServiceCenterShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2418,13 +2389,13 @@ ${_conditionType_} a.isConvenientCenterShow is null </if> </if> - <if test="conditionParamRef.containsKey('isConvenientCenterShowList')"> + <if test="conditionParamRef.containsKey('isConvenientCenterShowList') and conditionParamRef.isConvenientCenterShowList.size() > 0"> ${_conditionType_} a.isConvenientCenterShow in <foreach collection="conditionParamRef.isConvenientCenterShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('isConvenientCenterShowNotList')"> + <if test="conditionParamRef.containsKey('isConvenientCenterShowNotList') and conditionParamRef.isConvenientCenterShowNotList.size() > 0"> ${_conditionType_} a.isConvenientCenterShow not in <foreach collection="conditionParamRef.isConvenientCenterShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2439,13 +2410,13 @@ ${_conditionType_} a.terminalHandle is null </if> </if> - <if test="conditionParamRef.containsKey('terminalHandleList')"> + <if test="conditionParamRef.containsKey('terminalHandleList') and conditionParamRef.terminalHandleList.size() > 0"> ${_conditionType_} a.terminalHandle in <foreach collection="conditionParamRef.terminalHandleList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('terminalHandleNotList')"> + <if test="conditionParamRef.containsKey('terminalHandleNotList') and conditionParamRef.terminalHandleNotList.size() > 0"> ${_conditionType_} a.terminalHandle not in <foreach collection="conditionParamRef.terminalHandleNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2460,13 +2431,13 @@ ${_conditionType_} a.isOnline is null </if> </if> - <if test="conditionParamRef.containsKey('isOnlineList')"> + <if test="conditionParamRef.containsKey('isOnlineList') and conditionParamRef.isOnlineList.size() > 0"> ${_conditionType_} a.isOnline in <foreach collection="conditionParamRef.isOnlineList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('isOnlineNotList')"> + <if test="conditionParamRef.containsKey('isOnlineNotList') and conditionParamRef.isOnlineNotList.size() > 0"> ${_conditionType_} a.isOnline not in <foreach collection="conditionParamRef.isOnlineNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2481,13 +2452,13 @@ ${_conditionType_} a.isOnlinePayShow is null </if> </if> - <if test="conditionParamRef.containsKey('isOnlinePayShowList')"> + <if test="conditionParamRef.containsKey('isOnlinePayShowList') and conditionParamRef.isOnlinePayShowList.size() > 0"> ${_conditionType_} a.isOnlinePayShow in <foreach collection="conditionParamRef.isOnlinePayShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('isOnlinePayShowNotList')"> + <if test="conditionParamRef.containsKey('isOnlinePayShowNotList') and conditionParamRef.isOnlinePayShowNotList.size() > 0"> ${_conditionType_} a.isOnlinePayShow not in <foreach collection="conditionParamRef.isOnlinePayShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2502,13 +2473,13 @@ ${_conditionType_} a.entrustmentDepartmen is null </if> </if> - <if test="conditionParamRef.containsKey('entrustmentDepartmenList')"> + <if test="conditionParamRef.containsKey('entrustmentDepartmenList') and conditionParamRef.entrustmentDepartmenList.size() > 0"> ${_conditionType_} a.entrustmentDepartmen in <foreach collection="conditionParamRef.entrustmentDepartmenList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('entrustmentDepartmenNotList')"> + <if test="conditionParamRef.containsKey('entrustmentDepartmenNotList') and conditionParamRef.entrustmentDepartmenNotList.size() > 0"> ${_conditionType_} a.entrustmentDepartmen not in <foreach collection="conditionParamRef.entrustmentDepartmenNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2523,13 +2494,13 @@ ${_conditionType_} a.jointInfoShow is null </if> </if> - <if test="conditionParamRef.containsKey('jointInfoShowList')"> + <if test="conditionParamRef.containsKey('jointInfoShowList') and conditionParamRef.jointInfoShowList.size() > 0"> ${_conditionType_} a.jointInfoShow in <foreach collection="conditionParamRef.jointInfoShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('jointInfoShowNotList')"> + <if test="conditionParamRef.containsKey('jointInfoShowNotList') and conditionParamRef.jointInfoShowNotList.size() > 0"> ${_conditionType_} a.jointInfoShow not in <foreach collection="conditionParamRef.jointInfoShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2544,13 +2515,13 @@ ${_conditionType_} a.matterStatus is null </if> </if> - <if test="conditionParamRef.containsKey('matterStatusList')"> + <if test="conditionParamRef.containsKey('matterStatusList') and conditionParamRef.matterStatusList.size() > 0"> ${_conditionType_} a.matterStatus in <foreach collection="conditionParamRef.matterStatusList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('matterStatusNotList')"> + <if test="conditionParamRef.containsKey('matterStatusNotList') and conditionParamRef.matterStatusNotList.size() > 0"> ${_conditionType_} a.matterStatus not in <foreach collection="conditionParamRef.matterStatusNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2564,13 +2535,13 @@ ${_conditionType_} a.numberLimit is null </if> </if> - <if test="conditionParamRef.containsKey('numberLimitList')"> + <if test="conditionParamRef.containsKey('numberLimitList') and conditionParamRef.numberLimitList.size() > 0"> ${_conditionType_} a.numberLimit in <foreach collection="conditionParamRef.numberLimitList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('numberLimitNotList')"> + <if test="conditionParamRef.containsKey('numberLimitNotList') and conditionParamRef.numberLimitNotList.size() > 0"> ${_conditionType_} a.numberLimit not in <foreach collection="conditionParamRef.numberLimitNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2592,13 +2563,13 @@ ${_conditionType_} a.type is null </if> </if> - <if test="conditionParamRef.containsKey('typeList')"> + <if test="conditionParamRef.containsKey('typeList') and conditionParamRef.typeList.size() > 0"> ${_conditionType_} a.type in <foreach collection="conditionParamRef.typeList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('typeNotList')"> + <if test="conditionParamRef.containsKey('typeNotList') and conditionParamRef.typeNotList.size() > 0"> ${_conditionType_} a.type not in <foreach collection="conditionParamRef.typeNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2613,13 +2584,13 @@ ${_conditionType_} a.baseCode is null </if> </if> - <if test="conditionParamRef.containsKey('baseCodeList')"> + <if test="conditionParamRef.containsKey('baseCodeList') and conditionParamRef.baseCodeList.size() > 0"> ${_conditionType_} a.baseCode in <foreach collection="conditionParamRef.baseCodeList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('baseCodeNotList')"> + <if test="conditionParamRef.containsKey('baseCodeNotList') and conditionParamRef.baseCodeNotList.size() > 0"> ${_conditionType_} a.baseCode not in <foreach collection="conditionParamRef.baseCodeNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2634,13 +2605,13 @@ ${_conditionType_} a.implementCode is null </if> </if> - <if test="conditionParamRef.containsKey('implementCodeList')"> + <if test="conditionParamRef.containsKey('implementCodeList') and conditionParamRef.implementCodeList.size() > 0"> ${_conditionType_} a.implementCode in <foreach collection="conditionParamRef.implementCodeList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('implementCodeNotList')"> + <if test="conditionParamRef.containsKey('implementCodeNotList') and conditionParamRef.implementCodeNotList.size() > 0"> ${_conditionType_} a.implementCode not in <foreach collection="conditionParamRef.implementCodeNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2655,13 +2626,13 @@ ${_conditionType_} a.implementBodyCode is null </if> </if> - <if test="conditionParamRef.containsKey('implementBodyCodeList')"> + <if test="conditionParamRef.containsKey('implementBodyCodeList') and conditionParamRef.implementBodyCodeList.size() > 0"> ${_conditionType_} a.implementBodyCode in <foreach collection="conditionParamRef.implementBodyCodeList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('implementBodyCodeNotList')"> + <if test="conditionParamRef.containsKey('implementBodyCodeNotList') and conditionParamRef.implementBodyCodeNotList.size() > 0"> ${_conditionType_} a.implementBodyCode not in <foreach collection="conditionParamRef.implementBodyCodeNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2676,13 +2647,13 @@ ${_conditionType_} a.operateItemCode is null </if> </if> - <if test="conditionParamRef.containsKey('operateItemCodeList')"> + <if test="conditionParamRef.containsKey('operateItemCodeList') and conditionParamRef.operateItemCodeList.size() > 0"> ${_conditionType_} a.operateItemCode in <foreach collection="conditionParamRef.operateItemCodeList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('operateItemCodeNotList')"> + <if test="conditionParamRef.containsKey('operateItemCodeNotList') and conditionParamRef.operateItemCodeNotList.size() > 0"> ${_conditionType_} a.operateItemCode not in <foreach collection="conditionParamRef.operateItemCodeNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2697,13 +2668,13 @@ ${_conditionType_} a.townshipName is null </if> </if> - <if test="conditionParamRef.containsKey('townshipNameList')"> + <if test="conditionParamRef.containsKey('townshipNameList') and conditionParamRef.townshipNameList.size() > 0"> ${_conditionType_} a.townshipName in <foreach collection="conditionParamRef.townshipNameList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('townshipNameNotList')"> + <if test="conditionParamRef.containsKey('townshipNameNotList') and conditionParamRef.townshipNameNotList.size() > 0"> ${_conditionType_} a.townshipName not in <foreach collection="conditionParamRef.townshipNameNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2718,13 +2689,13 @@ ${_conditionType_} a.townshipCode is null </if> </if> - <if test="conditionParamRef.containsKey('townshipCodeList')"> + <if test="conditionParamRef.containsKey('townshipCodeList') and conditionParamRef.townshipCodeList.size() > 0"> ${_conditionType_} a.townshipCode in <foreach collection="conditionParamRef.townshipCodeList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('townshipCodeNotList')"> + <if test="conditionParamRef.containsKey('townshipCodeNotList') and conditionParamRef.townshipCodeNotList.size() > 0"> ${_conditionType_} a.townshipCode not in <foreach collection="conditionParamRef.townshipCodeNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2739,13 +2710,13 @@ ${_conditionType_} a.villageName is null </if> </if> - <if test="conditionParamRef.containsKey('villageNameList')"> + <if test="conditionParamRef.containsKey('villageNameList') and conditionParamRef.villageNameList.size() > 0"> ${_conditionType_} a.villageName in <foreach collection="conditionParamRef.villageNameList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('villageNameNotList')"> + <if test="conditionParamRef.containsKey('villageNameNotList') and conditionParamRef.villageNameNotList.size() > 0"> ${_conditionType_} a.villageName not in <foreach collection="conditionParamRef.villageNameNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2760,13 +2731,13 @@ ${_conditionType_} a.villageCode is null </if> </if> - <if test="conditionParamRef.containsKey('villageCodeList')"> + <if test="conditionParamRef.containsKey('villageCodeList') and conditionParamRef.villageCodeList.size() > 0"> ${_conditionType_} a.villageCode in <foreach collection="conditionParamRef.villageCodeList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('villageCodeNotList')"> + <if test="conditionParamRef.containsKey('villageCodeNotList') and conditionParamRef.villageCodeNotList.size() > 0"> ${_conditionType_} a.villageCode not in <foreach collection="conditionParamRef.villageCodeNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2781,13 +2752,13 @@ ${_conditionType_} a.operateTime is null </if> </if> - <if test="conditionParamRef.containsKey('operateTimeList')"> + <if test="conditionParamRef.containsKey('operateTimeList') and conditionParamRef.operateTimeList.size() > 0"> ${_conditionType_} a.operateTime in <foreach collection="conditionParamRef.operateTimeList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('operateTimeNotList')"> + <if test="conditionParamRef.containsKey('operateTimeNotList') and conditionParamRef.operateTimeNotList.size() > 0"> ${_conditionType_} a.operateTime not in <foreach collection="conditionParamRef.operateTimeNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2802,13 +2773,13 @@ ${_conditionType_} a.operateSite is null </if> </if> - <if test="conditionParamRef.containsKey('operateSiteList')"> + <if test="conditionParamRef.containsKey('operateSiteList') and conditionParamRef.operateSiteList.size() > 0"> ${_conditionType_} a.operateSite in <foreach collection="conditionParamRef.operateSiteList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('operateSiteNotList')"> + <if test="conditionParamRef.containsKey('operateSiteNotList') and conditionParamRef.operateSiteNotList.size() > 0"> ${_conditionType_} a.operateSite not in <foreach collection="conditionParamRef.operateSiteNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2823,13 +2794,13 @@ ${_conditionType_} a.cousultingShow is null </if> </if> - <if test="conditionParamRef.containsKey('cousultingShowList')"> + <if test="conditionParamRef.containsKey('cousultingShowList') and conditionParamRef.cousultingShowList.size() > 0"> ${_conditionType_} a.cousultingShow in <foreach collection="conditionParamRef.cousultingShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('cousultingShowNotList')"> + <if test="conditionParamRef.containsKey('cousultingShowNotList') and conditionParamRef.cousultingShowNotList.size() > 0"> ${_conditionType_} a.cousultingShow not in <foreach collection="conditionParamRef.cousultingShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2844,13 +2815,13 @@ ${_conditionType_} a.cousultingTelephoneShow is null </if> </if> - <if test="conditionParamRef.containsKey('cousultingTelephoneShowList')"> + <if test="conditionParamRef.containsKey('cousultingTelephoneShowList') and conditionParamRef.cousultingTelephoneShowList.size() > 0"> ${_conditionType_} a.cousultingTelephoneShow in <foreach collection="conditionParamRef.cousultingTelephoneShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('cousultingTelephoneShowNotList')"> + <if test="conditionParamRef.containsKey('cousultingTelephoneShowNotList') and conditionParamRef.cousultingTelephoneShowNotList.size() > 0"> ${_conditionType_} a.cousultingTelephoneShow not in <foreach collection="conditionParamRef.cousultingTelephoneShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2865,13 +2836,13 @@ ${_conditionType_} a.superviseShow is null </if> </if> - <if test="conditionParamRef.containsKey('superviseShowList')"> + <if test="conditionParamRef.containsKey('superviseShowList') and conditionParamRef.superviseShowList.size() > 0"> ${_conditionType_} a.superviseShow in <foreach collection="conditionParamRef.superviseShowList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('superviseShowNotList')"> + <if test="conditionParamRef.containsKey('superviseShowNotList') and conditionParamRef.superviseShowNotList.size() > 0"> ${_conditionType_} a.superviseShow not in <foreach collection="conditionParamRef.superviseShowNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2885,13 +2856,13 @@ ${_conditionType_} a.sort is null </if> </if> - <if test="conditionParamRef.containsKey('sortList')"> + <if test="conditionParamRef.containsKey('sortList') and conditionParamRef.sortList.size() > 0"> ${_conditionType_} a.sort in <foreach collection="conditionParamRef.sortList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('sortNotList')"> + <if test="conditionParamRef.containsKey('sortNotList') and conditionParamRef.sortNotList.size() > 0"> ${_conditionType_} a.sort not in <foreach collection="conditionParamRef.sortNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2912,13 +2883,13 @@ ${_conditionType_} a.source is null </if> </if> - <if test="conditionParamRef.containsKey('sourceList')"> + <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0"> ${_conditionType_} a.source in <foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('sourceNotList')"> + <if test="conditionParamRef.containsKey('sourceNotList') and conditionParamRef.sourceNotList.size() > 0"> ${_conditionType_} a.source not in <foreach collection="conditionParamRef.sourceNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2954,13 +2925,13 @@ ${_conditionType_} a.createUserId is null </if> </if> - <if test="conditionParamRef.containsKey('createUserIdList')"> + <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0"> ${_conditionType_} a.createUserId in <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('createUserIdNotList')"> + <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0"> ${_conditionType_} a.createUserId not in <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -2997,13 +2968,13 @@ ${_conditionType_} a.evaluationUrl is null </if> </if> - <if test="conditionParamRef.containsKey('evaluationUrlList')"> + <if test="conditionParamRef.containsKey('evaluationUrlList') and conditionParamRef.evaluationUrlList.size() > 0"> ${_conditionType_} a.evaluationUrl in <foreach collection="conditionParamRef.evaluationUrlList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('evaluationUrlNotList')"> + <if test="conditionParamRef.containsKey('evaluationUrlNotList') and conditionParamRef.evaluationUrlNotList.size() > 0"> ${_conditionType_} a.evaluationUrl not in <foreach collection="conditionParamRef.evaluationUrlNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -3018,13 +2989,13 @@ ${_conditionType_} a.netApplyUrl is null </if> </if> - <if test="conditionParamRef.containsKey('netApplyUrlList')"> + <if test="conditionParamRef.containsKey('netApplyUrlList') and conditionParamRef.netApplyUrlList.size() > 0"> ${_conditionType_} a.netApplyUrl in <foreach collection="conditionParamRef.netApplyUrlList" open="(" close=")" index="index" item="item" separator=","> #{item} </foreach> </if> - <if test="conditionParamRef.containsKey('netApplyUrlNotList')"> + <if test="conditionParamRef.containsKey('netApplyUrlNotList') and conditionParamRef.netApplyUrlNotList.size() > 0"> ${_conditionType_} a.netApplyUrl not in <foreach collection="conditionParamRef.netApplyUrlNotList" open="(" close=")" index="index" item="item" separator=","> #{item} @@ -3034,14 +3005,126 @@ <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('windowToTheSceneNumList') and conditionParamRef.windowToTheSceneNumList.size() > 0"> + field(a.windowToTheSceneNum, + <foreach collection="conditionParamRef.windowToTheSceneNumList" open="" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + , + </if> + <if test="conditionParamRef.containsKey('onlineToTheSceneNumList') and conditionParamRef.onlineToTheSceneNumList.size() > 0"> + field(a.onlineToTheSceneNum, + <foreach collection="conditionParamRef.onlineToTheSceneNumList" open="" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + , + </if> + <if test="conditionParamRef.containsKey('numberLimitList') and conditionParamRef.numberLimitList.size() > 0"> + field(a.numberLimit, + <foreach collection="conditionParamRef.numberLimitList" open="" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + , + </if> + <if test="conditionParamRef.containsKey('sortList') and conditionParamRef.sortList.size() > 0"> + field(a.sort, + <foreach collection="conditionParamRef.sortList" open="" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + , + </if> + <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0"> + field(a.source, + <foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + , + </if> + <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0"> + field(a.createUserId, + <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + , + </if> <trim suffixOverrides="," suffix=""> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> - ${item.colName} ${item.sortKind} + a.${item.colName} ${item.sortKind} </foreach> </trim> </if> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> order by + <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0"> + field(a.id, + <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + , + </if> + <if test="conditionParamRef.containsKey('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('windowToTheSceneNumList') and conditionParamRef.windowToTheSceneNumList.size() > 0"> + field(a.windowToTheSceneNum, + <foreach collection="conditionParamRef.windowToTheSceneNumList" open="" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + , + </if> + <if test="conditionParamRef.containsKey('onlineToTheSceneNumList') and conditionParamRef.onlineToTheSceneNumList.size() > 0"> + field(a.onlineToTheSceneNum, + <foreach collection="conditionParamRef.onlineToTheSceneNumList" open="" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + , + </if> + <if test="conditionParamRef.containsKey('numberLimitList') and conditionParamRef.numberLimitList.size() > 0"> + field(a.numberLimit, + <foreach collection="conditionParamRef.numberLimitList" open="" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + , + </if> + <if test="conditionParamRef.containsKey('sortList') and conditionParamRef.sortList.size() > 0"> + field(a.sort, + <foreach collection="conditionParamRef.sortList" open="" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + , + </if> + <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0"> + field(a.source, + <foreach collection="conditionParamRef.sourceList" 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 @@ -3440,6 +3523,8 @@ </if> </trim> </if> + + </sql> <sql id="_group_by_"> <if test="groupList != null and !groupList.isEmpty()"> -- 2.24.3