ariesy 票池导出条件修改

dxhy-core/src/main/resources/mapper/CustomsMapper.xml

@@ -148,21 +148,9 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </if>
-        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
-            and (t.comp_code in
-            <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
-                #{companyCode}
-            </foreach>
-            or t.comp_code is null or t.comp_code = ''
-            )
-        </if>
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode != '88'">
-            and t.comp_code = #{companyCode}
+            and (t.comp_code = #{companyCode} and t.comp_code = '' or t.comp_code is null)
         </if>
-        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode == '88'">
-            and (t.comp_code = '' or t.comp_code is null)
-        </if>
-
         order by t.fill_in_date desc
     </select>
 

dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml

@@ -165,19 +165,8 @@
         <if test="bzr != null and bzr != '' and bzr != 'null'">
             and bzr like concat('%',#{bzr},'%')
         </if>
-        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
-            and (comp_code in
-            <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
-                #{companyCode}
-            </foreach>
-            or comp_code is null or comp_code = ''
-            )
-        </if>
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode != '88'">
-            and comp_code = #{companyCode}
+            and (comp_code = #{companyCode} or comp_code is null or comp_code = '')
-        </if>
-        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode == '88'">
-            and (comp_code is null or comp_code = '')
         </if>
         GROUP BY uuid having min(create_date)
         ORDER BY create_date DESC