From b44b174f656aac1fe03e7f96851e564c3982f67d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 28 三月 2025 16:52:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN

---
 medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java
index d50a0f8..281d65f 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java
@@ -94,8 +94,9 @@
     @ApiOperation(value = "处置统计上",tags = "处置人员")
     @PostMapping("/end/total")
     public R<List<CollectTotalUpDto>> outtotal1(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date) {
-        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
-        return R.ok(mwCheckoutRecordService.totalUp2(date,sysUser.getDepartmentId()));
+        SysDepartment myDepartment = departmentService.getMyDepartment();
+        List<CollectTotalUpDto> collectTotalUpDtos = mwCheckoutRecordService.totalUp2(date, myDepartment.getId());
+        return R.ok(collectTotalUpDtos);
     }
 
     @ApiOperation(value = "处置统下",tags = "处置人员")

--
Gitblit v1.7.1