From 90ed250a3395aff654b8020212f32ab2c3f921a2 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 16 四月 2024 13:37:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ManPakOutController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ManPakOutController.java b/src/main/java/com/zy/asrs/controller/ManPakOutController.java
index 051f035..fe998e3 100644
--- a/src/main/java/com/zy/asrs/controller/ManPakOutController.java
+++ b/src/main/java/com/zy/asrs/controller/ManPakOutController.java
@@ -81,7 +81,12 @@
etime = DateUtils.convert(dates[1]);
}
- List<PakOutDTO> pakOutDTOS = manPakOutService.selectPakOut(docnum, stime, etime, curr, limit,getUserId());
+ Long userId = getUserId();
+ if(getUser().getRoleId() == 2 || getUser().getRoleId() == 24){
+ userId = null;
+ }
+
+ List<PakOutDTO> pakOutDTOS = manPakOutService.selectPakOut(docnum, stime, etime, curr, limit,userId);
for (PakOutDTO pakOutDTO:pakOutDTOS){
List<ManPakOut> manPakOuts = manPakOutService.selectList(new EntityWrapper<ManPakOut>().eq("doc_num", pakOutDTO.getDoc_num()));
for (ManPakOut manPakOut:manPakOuts){
@@ -96,7 +101,7 @@
}
- int count = manPakOutService.selectPakOutCount(docnum, stime, etime,curr, limit,getUserId());
+ int count = manPakOutService.selectPakOutCount(docnum, stime, etime,curr, limit,userId);
Page<PakOutDTO> page = new Page<>();
// 鏈�鍚庢寜鐘舵�佹湭鍑哄簱->宸插嚭搴撴帓搴�
// page.setRecords(pakOutDTOS.stream().sorted(Comparator.comparingInt(PakOutDTO::getStatus)).collect(Collectors.toList()));
--
Gitblit v1.9.1