From ec4d16c8a630960a4671a60f4d1957fd3de9def3 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期四, 27 二月 2025 16:53:59 +0800
Subject: [PATCH] 完成维修工单查看维修记录子表
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/utils/DataFilterUtil.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/utils/DataFilterUtil.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/utils/DataFilterUtil.java
index 8ecc5d3..03f16af 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/utils/DataFilterUtil.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/utils/DataFilterUtil.java
@@ -42,7 +42,10 @@
//TODO 缁翠慨宸ュ彧鑳芥煡璇㈡湭鎺ュ崟鐘舵�佺殑鎶ヤ慨鍗曪紙鍏蜂綋鐘舵�佸弬鑰冨瓧鍏竢epair_req_status锛�
bo.setStatus(DictConstants.REPAIR_REQ_STATUS_DETAIL.JIEDAN);
}
- params.put("createBy", userList);
+ if(userList.size()>0){
+ params.put("createBy", userList);
+ }
+
}
//缁翠慨宸ュ崟
@@ -50,19 +53,18 @@
LoginUser loginUser = LoginHelper.getLoginUser();
Set<String> rolePermission = loginUser.getRolePermission();
Map<String, Object> params = bo.getParams();
- List<Long> userList = new ArrayList<>();
if (rolePermission == null) {
//娌℃湁鏉冮檺涓嶅厑璁告煡璇㈡暟鎹�
- userList.add(-1L);
+ bo.setReqUser(-1L);
+ bo.setResUser(-1L);
}else if (rolePermission.contains(Role.operator.name())) {
//鎿嶄綔宸ュ彧鑳芥煡璇㈣嚜宸辩殑鏁版嵁
- userList.add(loginUser.getUserId());
+ bo.setReqUser(loginUser.getUserId());
}else if (rolePermission.contains(Role.repair.name())) {
//TODO 缁翠慨宸ュ彧鑳芥煡璇㈡湭鎺ュ崟鐘舵�佺殑鎶ヤ慨鍗曪紙鍏蜂綋鐘舵�佸弬鑰冨瓧鍏竢epair_req_status锛�
- bo.setStatus(DictConstants.REPAIR_REQ_STATUS_DETAIL.JIEDAN);
+ bo.setResUser(loginUser.getUserId());
}
- params.put("createBy", userList);
}
}
--
Gitblit v1.9.3