添加申请页面抓取

base-manager/src/main/resources/sqlmap/module/app/AppDatasetMapperExt.xml

@@ -64,7 +64,7 @@
     <sql id="_second_condition_">
         <if test="condition != null and !condition.isEmpty()">
             <!-- 条件映射-普通条件 -->
-            <include refid="_condition_param_">
+            <include refid="_second_condition_param_">
                 <property name="_conditionParam_" value="condition"/>
                 <property name="_conditionType_" value="and"/>
             </include>
@@ -73,7 +73,7 @@
                 and
                 <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
                     <trim prefixOverrides="or" prefix="(" suffix=")">
-                        <include refid="_condition_param_">
+                        <include refid="_second_condition_param_">
                             <property name="_conditionParam_" value="andCondition"/>
                             <property name="_conditionType_" value="or"/>
                         </include>
@@ -85,7 +85,7 @@
                 and
                 <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
                     <trim prefixOverrides="and" prefix="(" suffix=")">
-                        <include refid="_condition_param_">
+                        <include refid="_second_condition_param_">
                             <property name="_conditionParam_" value="orCondition"/>
                             <property name="_conditionType_" value="and"/>
                         </include>
@@ -97,32 +97,6 @@
     <!-- 条件映射-代参数 -->
     <sql id="_second_condition_param_">
         <bind name="conditionParamRef" value="${_conditionParam_}"/>
-        <if test="conditionParamRef.containsKey('id')">
-            <if test="conditionParamRef.id != null">
-                ${_conditionType_} b.id=#{${_conditionParam_}.id}
-            </if>
-        </if>
-        <if test="conditionParamRef.containsKey('id')">
-            <if test="conditionParamRef.id != null ">
-                ${_conditionType_} b.id = #{${_conditionParam_}.id}
-            </if>
-            <if test="conditionParamRef.id == null">
-                ${_conditionType_} b.id is null
-            </if>
-        </if>
-        <if test="conditionParamRef.containsKey('idList')">
-            ${_conditionType_} b.id in
-            <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
-        </if>
-        <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
-            ${_conditionType_} b.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
-        </if>
-        <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
-            ${_conditionType_} b.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
-        </if>
-
         <if test="conditionParamRef.containsKey('datasetId')">
             <if test="conditionParamRef.datasetId != null ">
                 ${_conditionType_} b.datasetId = #{${_conditionParam_}.datasetId}