From e0b5d9d28985ae3ff9271c77a3e16a5407d4f5c5 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Sun, 4 Jun 2023 20:24:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=8B=BE=E9=80=89=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0uuid=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/controller/BaseInvoiceController.java | 18 ++++++++++--------
 .../main/resources/mapper/BaseSggxcxMapper.xml |  4 ++++
 2 files changed, 14 insertions(+), 8 deletions(-)

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 3f7de4bb..5943b0fc 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
@@ -885,11 +885,11 @@ public class BaseInvoiceController extends AbstractController {
             gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
         }
 
-        //todo合并分支后把checkList加上可以让用户不使用上级权限就可以进行认证
+        //TODO 合并分支后把checkList加上可以让用户不使用上级权限就可以进行认证
 
         pramsMap.put("gfsh",gfshList);
 
-        pramsMap.put("sign","88");
+        pramsMap.put("sign","99");
 
 
         if (StringUtils.isNotBlank(companyCode)){
@@ -966,6 +966,12 @@ public class BaseInvoiceController extends AbstractController {
         }else {
             String companyCode = (String) map.get("companyCode");
             String gfsh = (String)map.get("gfsh");
+            List<String> gfshList = new ArrayList<>();
+            if(StringUtils.isBlank(gfsh) && "99".equals(gfsh)){
+                gfshList=UserInfoUtil.getGfshAll(getUserInfo().getOrg());
+            }else {
+                gfshList.add(gfsh);
+            }
             String gxType = (String) map.get("gxType");
 
             if (StringUtils.isBlank(gxType)){
@@ -976,6 +982,7 @@ public class BaseInvoiceController extends AbstractController {
             map.put("dbName", getUserInfo().getDbName());
             List<Tax> taxList = getUserInfo().getOrg();
             map.put("taxList", taxList);
+            map.put("gfsh",gfshList);
             map.put("qsflag", getUserInfo().getQsStatus());
 //            List<String> gfshList = new ArrayList<>();
 //            if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {
@@ -1020,13 +1027,8 @@ public class BaseInvoiceController extends AbstractController {
             pramsMap.put("loginName", getLoginName());
             pramsMap.put("userName", getUserName());
             pramsMap.put("gxType", gxType);
-            List<String> gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
+            pramsMap.put("gfsh", gfshList);
 
-            if (!gfshList.isEmpty()) {
-                pramsMap.put("gfsh", gfshList);
-            } else {
-                return ResponseEntity.ok(R.error("购方信息不能为空！"));
-            }
 
         }
 
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 71a44234..a58ddff9 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -35,6 +35,7 @@
         <result column="suspend_status" property="suspendStatus"/>
         <result column="suspend_date" property="suspendDate"/>
         <result column="bzr" property="bzr"/>
+        <result column="uuid" property="uuid"/>
     </resultMap>
     <resultMap id="hjResultMap"
                type="com.dxhy.base.entity.BaseTDxRecordInvoice">
@@ -1343,6 +1344,7 @@
             (@total := @total + tax_amount) AS max_tax,
             invoice_type,
             comp_code,
+            uuid,
             invoice_code,
             invoice_no,
             gf_name,
@@ -1377,6 +1379,7 @@
             and auth_status in('0','5','6')
             and export_mark = '0'
             and invoice_status = '0'
+            and company = #{company}
             <if test="sign !='88'">
                 and t.gf_tax_no in
                 <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
@@ -1433,6 +1436,7 @@
         and auth_status in('0','5','6')
         and export_mark = '0'
         and invoice_status = '0'
+        and company = #{company}
         <if test="sign !='88'">
             and t.gf_tax_no in
             <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">