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 | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 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 bee36a7..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
@@ -1,10 +1,12 @@
package org.dromara.eims.utils;
+import org.dromara.common.core.constant.DictConstants;
import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.eims.domain.bo.EimsRepairReqBo;
+import org.dromara.eims.domain.bo.EimsRepairResBo;
-import java.util.Set;
+import java.util.*;
/**
* 鑷畾涔夋暟鎹殧绂�
@@ -26,17 +28,43 @@
//鎶ヤ慨鍗�
public void filterRepairReq(EimsRepairReqBo bo){
LoginUser loginUser = LoginHelper.getLoginUser();
- if (loginUser == null) return;
Set<String> rolePermission = loginUser.getRolePermission();
- if (rolePermission == null) return;
- if (rolePermission.contains(Role.operator.name())) {
- //缁翠慨宸ュ彧鑳芥煡璇㈣嚜宸辩殑鏁版嵁
- bo.setCreateBy(loginUser.getUserId());
+ Map<String, Object> params = bo.getParams();
+ List<Long> userList = new ArrayList<>();
+ if (rolePermission == null) {
+ //娌℃湁鏉冮檺涓嶅厑璁告煡璇㈡暟鎹�
+ userList.add(-1L);
+
+ }else if (rolePermission.contains(Role.operator.name())) {
+ //鎿嶄綔宸ュ彧鑳芥煡璇㈣嚜宸辩殑鏁版嵁
+ userList.add(loginUser.getUserId());
}else if (rolePermission.contains(Role.repair.name())) {
//TODO 缁翠慨宸ュ彧鑳芥煡璇㈡湭鎺ュ崟鐘舵�佺殑鎶ヤ慨鍗曪紙鍏蜂綋鐘舵�佸弬鑰冨瓧鍏竢epair_req_status锛�
- bo.setStatus("0");
+ bo.setStatus(DictConstants.REPAIR_REQ_STATUS_DETAIL.JIEDAN);
}
- System.err.println(loginUser);
+ if(userList.size()>0){
+ params.put("createBy", userList);
+ }
+
+ }
+
+ //缁翠慨宸ュ崟
+ public void filterRepairRes(EimsRepairResBo bo){
+ LoginUser loginUser = LoginHelper.getLoginUser();
+ Set<String> rolePermission = loginUser.getRolePermission();
+ Map<String, Object> params = bo.getParams();
+ if (rolePermission == null) {
+ //娌℃湁鏉冮檺涓嶅厑璁告煡璇㈡暟鎹�
+ bo.setReqUser(-1L);
+ bo.setResUser(-1L);
+
+ }else if (rolePermission.contains(Role.operator.name())) {
+ //鎿嶄綔宸ュ彧鑳芥煡璇㈣嚜宸辩殑鏁版嵁
+ bo.setReqUser(loginUser.getUserId());
+ }else if (rolePermission.contains(Role.repair.name())) {
+ //TODO 缁翠慨宸ュ彧鑳芥煡璇㈡湭鎺ュ崟鐘舵�佺殑鎶ヤ慨鍗曪紙鍏蜂綋鐘舵�佸弬鑰冨瓧鍏竢epair_req_status锛�
+ bo.setResUser(loginUser.getUserId());
+ }
}
}
--
Gitblit v1.9.3