From 8c5c5ce2938bd4f88f12722abe740570d9ed165e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 13 十二月 2024 18:03:19 +0800
Subject: [PATCH] 暂存间管理接口

---
 medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java
index b4d3dbb..fd187a1 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java
@@ -50,6 +50,8 @@
                 return PageDTO.empty(0L, 0L);
             }
             treeCode = myDepartment.getTreeCode();
+        } else {
+            treeCode = sysDepartmentService.getById(query.getDepartmentId()).getTreeCode();
         }
         Page<MwCollectRecordVO> page = baseMapper.pageList(new Page<>(query.getPageCurr(), query.getPageSize()), query, treeCode);
         return PageDTO.of(page);
@@ -93,7 +95,17 @@
 
     @Override
     public void export(MwCollectRecordQuery query, HttpServletResponse response) throws IOException {
-        List<MwCollectRecordVO> vo = baseMapper.getExportList(query);
+        String treeCode = "";
+        if (Objects.isNull(query.getDepartmentId())) {
+            SysDepartment myDepartment = sysDepartmentService.getMyDepartment();
+            if (Objects.isNull(myDepartment)) {
+                return;
+            }
+            treeCode = myDepartment.getTreeCode();
+        } else {
+            treeCode = sysDepartmentService.getById(query.getDepartmentId()).getTreeCode();
+        }
+        List<MwCollectRecordVO> vo = baseMapper.getExportList(query, treeCode);
         // 这里注意 有同学反应使用swagger 会导致各种问题,请直接用浏览器或者用postman
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setCharacterEncoding("utf-8");

--
Gitblit v1.7.1