From 571e1017cfe812ba66163155028c8093d22896b5 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Thu, 14 Nov 2024 15:34:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E8=B4=A6?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinUncollectedReceivablesDetailedMapper.xml             | 6 ++++--
 .../FinUncollectedReceivablesDetailedService.java           | 6 ++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
index 6e0844bf00..5086716da8 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
@@ -691,6 +691,7 @@
                 FROM
                     (
                         SELECT
+                            createBySid,
                             orgSidPath,
                             contractSid,
                             customerName,
@@ -701,7 +702,7 @@
                         WHERE
                             f.kxState = '01'
                         GROUP BY
-                            f.contractNo
+                            f.contractNo,f.createBySid
                     ) AS a
             ) b
         <where>
@@ -946,6 +947,7 @@
         FROM
         (
         SELECT
+        createBySid,
         orgSidPath,
         contractSid,
         customerName,
@@ -956,7 +958,7 @@
         WHERE
         f.kxState = '01'
         GROUP BY
-        f.contractNo
+        f.contractNo,f.createBySid
         ) AS a
         ) b
         <where>
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
index 06c4d1f4ce..8c22a44d80 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
@@ -1266,8 +1266,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
                     orgPath = orgPath.substring(0, i4);
                     qw.like("b.orgSidPath", orgPath);
                 } else if ("5".equals(orgLevelKey)) {
-                    orgPath = orgPath.substring(0, i4);
-                    qw.like("b.orgSidPath", orgPath);
+                    qw.like("b.createBySid", query.getUserSid());
                 } else {
                     PagerVo<CustomerBillSummaryVo> p = new PagerVo<>();
                     return p;
@@ -1345,8 +1344,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
                     orgPath = orgPath.substring(0, i4);
                     qw.like("b.orgSidPath", orgPath);
                 } else if ("5".equals(orgLevelKey)) {
-                    orgPath = orgPath.substring(0, i4);
-                    qw.like("b.orgSidPath", orgPath);
+                    qw.like("b.createBySid", query.getUserSid());
                 } else {
                     return new ArrayList<>();
                 }