From 4f5328bd85be48950507b07108bbebed200fe298 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Wed, 22 Oct 2025 10:03:13 +0800
Subject: [PATCH] =?UTF-8?q?10-22=20=E6=94=B6=E6=AC=BE=EF=BC=9A=E5=9C=B0?=
 =?UTF-8?q?=E5=8C=BA=E6=9D=83=E9=99=90=E7=BB=A7=E7=BB=AD=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=88=E5=9C=B0=E6=96=B9=E8=B4=A2=E5=8A=A1=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/serviceImpl/cash/CashCollectionServiceImpl.java     |  5 ++++-
 src/main/resources/cashMapper/CashCollectionMapper.xml       | 12 ++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
index 209fde2..f31fac4 100644
--- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
@@ -196,15 +196,18 @@ public class CashCollectionServiceImpl implements CashCollectionService {
             cashCollection.setSubmitterMarket(null);
         }
         if (cashCollection.getCashRoleId()==1){
-            //角色是地方财务，提交人置空不设筛选条件,仅按地区筛选，查看
+            //角色是地方财务，提交人置空不设筛选条件,仅按收款地区、提交人地区筛选（）
 
             if(cashCollection.getStatus()==null){
             cashCollection.setStatus(123460);}
+            //状态为待审核和已驳回时按照提交人地区筛选
             if (cashCollection.getStatus()==0||cashCollection.getStatus()==2){
                 cashCollection.setReceivedMarket(null);}
+            //状态为已通过和Link通过时，按收款地区筛选
             if (cashCollection.getStatus()==1||cashCollection.getStatus()==3){
                 cashCollection.setSubmitterMarket(null);}
             cashCollection.setSubmitterId(null);
+            //状态为46，已通过和已退款，满足收款地区或提交人地区即可，
 
         }
         if (cashCollection.getCashRoleId()==0){
diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml
index 25d247b..a9d8cce 100644
--- a/src/main/resources/cashMapper/CashCollectionMapper.xml
+++ b/src/main/resources/cashMapper/CashCollectionMapper.xml
@@ -147,8 +147,8 @@
             AND cr.submitter_id = #{cashCollection.submitterId}
         </if>
             <!-- 其他原有条件不变 -->
-   <!--         <choose>
-                <when test="cashCollection.status != null and cashCollection.status == 4">
+            <choose>
+                <when test="cashCollection.status != null and cashCollection.status == 46">
                     <if test="cashCollection.receivedMarket != null and cashCollection.receivedMarket != ''">
                         AND (cr.received_market = #{cashCollection.receivedMarket}
                         <if test="cashCollection.submitterMarket != null and cashCollection.submitterMarket != ''">
@@ -162,16 +162,16 @@
                     </if>
                 </when>
 
-                &lt;!&ndash; 非 status=4 保持原逻辑：同时满足 &ndash;&gt;
-                <otherwise>-->
+                <!-- 非 status=46 保持原逻辑：同时满足 -->
+                <otherwise>
                     <if test="cashCollection.receivedMarket != null and cashCollection.receivedMarket != ''">
                         AND cr.received_market = #{cashCollection.receivedMarket}
                     </if>
                     <if test="cashCollection.submitterMarket != null and cashCollection.submitterMarket != ''">
                         AND cr.submitter_market = #{cashCollection.submitterMarket}
                     </if>
-         <!--       </otherwise>
-            </choose>-->
+                </otherwise>
+            </choose>
         <if test="cashCollection.activity!=null and cashCollection.activity!=''">
             AND cr.activity like concat('%',#{cashCollection.activity},'%')
         </if>