From af65b0dc2bb0ec5d182705f7fc811725716c9761 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 9 May 2023 11:13:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/sys/service/impl/SysUserServiceImpl.java |  4 ++++
 .../base/controller/BaseInvoiceController.java     | 14 ++++++++------
 .../java/com/dxhy/base/model/BaseSggxCxRespVO.java |  5 +++++
 .../BaseInvoiceManualCheckServiceImpl.java         |  1 +
 .../src/main/resources/mapper/BaseFpZhMapper.xml   | 14 ++++++++++----
 5 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java
index 83d666f7..881c9306 100644
--- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java
+++ b/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);
diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
index 5919aab5..18338429 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
+++ b/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<>();
-        if (StringUtils.isNotBlank(companyCode) && !"99".equals(companyCode)){
-            companyCodeList.add(companyCode);
-        }else {
-            companyCodeList = getUserInfo().getCompanyCodes();
+//        List<String> companyCodeList = new ArrayList<>();
+        if (StringUtils.isNotBlank(companyCode)){
+//            companyCodeList.add(companyCode);
+            pramsMap.put("companyCode",companyCode);
         }
-        pramsMap.put("companyCodes",companyCodeList);
+//        else {
+//            companyCodeList = getUserInfo().getCompanyCodes();
+//        }
+
         if (!StringHelper.isBlank(invoiceType)) {
             if (!"99".equals(invoiceType)) {
                 pramsMap.put("invoiceType", invoiceType);
diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java
index ddb422ee..c94734f7 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java
@@ -154,4 +154,9 @@ public class BaseSggxCxRespVO {
      */
     private String bzdh;
 
+    /**
+     * 组织编码
+     */
+    private String compCode;
+
 }
diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
index 9950f8b1..7d45eee7 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
+++ b/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) {
diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 1c646673..5a8009d3 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/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
-        <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>
+<!--        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}