From 76c5ad320495758d4e76d852d96914f1b405ece7 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 15 九月 2025 11:52:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index 968e0e3..a46ac13 100644
--- a/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -103,14 +103,14 @@
if (sysUser == null) {
return page;
}
- if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
- //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
- List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
- queryWrapper.in("e.equipment_code", equipArr);
- } else {
- //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
- queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id", sysUser.getId());
- }
+// if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
+// //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+// List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+// queryWrapper.in("e.equipment_code", equipArr);
+// } else {
+// //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
+// queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id", sysUser.getId());
+// }
//鏌ヨ鏉′欢杩囨护
if (eamEquipment != null) {
if (StringUtils.isNotBlank(eamEquipment.getEquipmentCode())) {
--
Gitblit v1.9.3