修改mapper文件

dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java

@@ -189,13 +189,14 @@ public class BaseInvoiceController extends AbstractController {
         pramsMap.put("gfsh", gfshList);
         //所属组织
 //        List<String> companyCodeList = new ArrayList<>();
-        if (StringUtils.isNotBlank(companyCode)){
+//        if (StringUtils.isNotBlank(companyCode)){
 //            companyCodeList.add(companyCode);
-            pramsMap.put("companyCode",companyCode);
-        }
-//        else {
+//        }else {
 //            companyCodeList = getUserInfo().getCompanyCodes();
 //        }
+        if (StringUtils.isNotBlank(companyCode)){
+            pramsMap.put("companyCodes",companyCode);
+        }
 
         if (!StringHelper.isBlank(invoiceType)) {
             if (!"99".equals(invoiceType)) {

dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml

@@ -82,10 +82,12 @@
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
-        and t.comp_code in
-        <foreach collection="companyCodes" index="index" item="companyCode" open="(" separator="," close=")">
-            #{companyCode}
-        </foreach>
+        <if test="companyCodes != null and companyCodes != '99' and companyCodes != '88 and companyCodes != '' and companyCodes != 'null'" >
+            and t.comp_code = #{companyCodes}
+        </if>
+        <if test="companyCodes != null and companyCodes != ''  and companyCodes = '88'">
+            and (t.comp_code = '' or t.comp_code is null)
+        </if>
         <if test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' ">
             and t.invoice_status = #{invoiceStatus}
         </if>
@@ -345,12 +347,7 @@
         <if test="companyCodes != null and companyCodes != ''  and companyCodes = '88'">
             and (t.comp_code = '' or t.comp_code is null)
         </if>
-<!--        and t.comp_code in-->
-<!--        <foreach collection="companyCodes" index="index" item="companyCode" open="(" separator="," close=")">-->
-<!--            #{companyCode}-->
-<!--        </foreach>-->
-        <if
-                test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' ">
+        <if  test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' ">
             and t.invoice_status = #{invoiceStatus}
         </if>
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">