From 373bdf97b818a1a32176bccf5d45f7efb23dfe6c Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 25 Apr 2025 10:04:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9PC=E7=AB=AF=E5=BA=94=E6=94=B6?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=9D=A1=E4=BB=B6=E6=B7=BB=E5=8A=A0=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E4=B8=93=E5=91=98=E7=9A=84=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinUncollectedReceivablesDetailedQuery.java           | 3 +++
 .../FinUncollectedReceivablesDetailedService.java         | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java
index 6ffa8cc43a..1d8e45025d 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java
@@ -90,4 +90,7 @@ public class FinUncollectedReceivablesDetailedQuery implements Query {
 
     private String noMoneyStart; //未还金额开始
     private String noMoneyEnd; //未还金额结束
+
+    @ApiModelProperty("业务员销售部门sid")
+    private String staffDeptSid;
 }
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 6f71a79e1d..e770f84f27 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
@@ -200,9 +200,14 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
     public List<DetailsOfReceivablesAndUncollectedItemsVo> listAllVo(FinUncollectedReceivablesDetailedQuery query) {
         QueryWrapper<FinUncollectedReceivablesDetailed> qw = new QueryWrapper<>();
         String useOrgSid = "";
+        String staffDeptSid = "";
         if (StringUtils.isNotBlank(query.getOrgPath())) {
             useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
             query.setUseOrgSid(useOrgSid);
+            if(StringUtils.isNotBlank(query.getState()) && "0".equals(query.getState())){//销售专员申请
+                staffDeptSid = query.getOrgPath().substring(query.getOrgPath().lastIndexOf("/") + 1);
+                query.setStaffDeptSid(staffDeptSid);
+            }
         } else {
             String createBySid = query.getCreateBySid();
             useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(createBySid).getData();
@@ -250,6 +255,9 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
                 qw.notLike("furd.receivablesName", "融资放款");
             }
         }
+        if(StringUtils.isNotBlank(query.getStaffDeptSid())){
+            qw.eq("furd.staffDeptSid",query.getStaffDeptSid());
+        }
         List<DetailsOfReceivablesAndUncollectedItemsVo> list = baseMapper.selectListAllVo(qw);
         return list;
     }