From 2e1039b373bf2ad12f44e5fda0574cfd053b08ae Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 21 四月 2025 10:42:06 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into dev

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
index 01439f8..f3ece0a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
@@ -154,7 +154,7 @@
                 if (presist.getPayFeesStatus().equals("3")){
                     throw new ServiceException("该账单已缴费完成");
                 }
-                save.setBusinessDeptId(presist.getBusinessDeptId());
+
                 switch (type){
                     // 仅更新除金额字段外的属性
                     case 1:
@@ -211,6 +211,7 @@
                     break;
 
                 }
+                save.setBusinessDeptId(presist.getBusinessDeptId());
                 updateById(save);
                 return save;
             }finally {
@@ -418,6 +419,7 @@
         }
 
     }
+
 
     /**
      * 根据发票编号查询账单列表
@@ -668,8 +670,4 @@
     }
 
 
-    @Override
-    public List<ScreenRentRankVO> getStreetRentRank() {
-        return null;
-    }
 }

--
Gitblit v1.7.1