Merge remote-tracking branch 'origin/master'

zjugis-business/src/main/resources/mapper/oracle/UseMoneyMapper.xml

@@ -111,7 +111,7 @@
             T1.COST_TYPE LIKE '14%' and (T2.FLOW_STATUS=90 or T2.FLOW_STATUS=89)
             <if test="params != null and params.collectionCompany != null and params.collectionCompany != ''">
                 <bind name="collectionCompany" value="'%'+params.collectionCompany+'%'"/>
-                AND 1!=1
+                AND T2.ID IS NULL
             </if>
             <if test="params != null and params.REMARK != null and params.REMARK != ''">
                 <bind name="REMARK" value="'%'+params.REMARK+'%'"/>
@@ -292,7 +292,7 @@
             </if>
             <if test="params != null and params.collectionCompany != null and params.collectionCompany != ''">
                 <bind name="collectionCompany" value="'%'+params.collectionCompany+'%'"/>
-                AND 1!=1
+                AND T2.ID IS  NULL
             </if>
             <if test="params != null and params.REMARK != null and params.REMARK != ''">
                 <bind name="REMARK" value="'%'+params.REMARK+'%'"/>
@@ -461,7 +461,7 @@ select sum(num) from (
             T1.ISVALID = 1 and (T2.FLOW_STATUS=90 or T2.FLOW_STATUS=89) AND T2.ISVALID = 1 and T1.COST_TYPE LIKE '14%'
             <if test="params != null and params.collectionCompany != null and params.collectionCompany != ''">
                 <bind name="collectionCompany" value="'%'+params.collectionCompany+'%'"/>
-                AND 1!=1
+                AND T2.ID IS  NULL
             </if>
             <if test="params != null and params.REMARK != null and params.REMARK != ''">
                 <bind name="REMARK" value="'%'+params.REMARK+'%'"/>