修改mapper文件

dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java

@@ -294,6 +294,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
                         }
                     }
                 }
+                SysCompanyEntity company = new SysCompanyEntity();
+                company.setCompanyName("()暂无组织编码发票");
+                company.setCompanyCode("88");
+                companyEntitys.add(company);
             }
 
             user = this.toUser(user, userEntity);

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

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

dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java

@@ -154,4 +154,9 @@ public class BaseSggxCxRespVO {
      */
     private String bzdh;
 
+    /**
+     * 组织编码
+     */
+    private String compCode;
+
 }

dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java

@@ -188,6 +188,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                     //报账单号和入账状态
 //                    vo.setInAccountStatus(pageList.get(i).getInvoiceStatus());
                     vo.setBzdh(pageList.get(i).getBzdh());
+                    vo.setCompCode(pageList.get(i).getCompCode());
                     // 签收方式为已经签收时展示签收信息
                     if ("1".equals(pageList.get(i).getQsStatus())) {
                         if (pageList.get(i).getQsDate() != null) {

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

@@ -339,10 +339,16 @@
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
-        and t.comp_code in
+        <if test="companyCodes != null and companyCodes != '99' and companyCodes != '88 and companyCodes != '' and companyCodes != 'null'" >
-        <foreach collection="companyCodes" index="index" item="companyCode" open="(" separator="," close=")">
+            and t.comp_code = #{companyCodes}
-            #{companyCode}
+        </if>
-        </foreach>
+        <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' ">
             and t.invoice_status = #{invoiceStatus}