From 78ee8165199655f2fb5a73775d3101da77a0d367 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 10 六月 2025 10:55:21 +0800
Subject: [PATCH] 增加管理制度
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
index ebb7e5a..26bc963 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
@@ -723,7 +723,7 @@
DailyInspectionStandard standard = dailyInspectionStandardService.getOne(new LambdaQueryWrapper<DailyInspectionStandard>()
.eq(DailyInspectionStandard::getEquipmentId, equipment.getId())
.eq(DailyInspectionStandard::getDelFlag, 0)
- .eq(DailyInspectionStandard::getVersion, "2"));
+ .eq(DailyInspectionStandard::getVersionStatus, "2"));
@@ -741,8 +741,9 @@
if(area != null){
mapResult.put("workCenterName",area.getName());
}
- mapResult.put("regulations",standard.getDisUda1());
-
+ if(standard != null){
+ mapResult.put("regulations",standard.getDisUda1());
+ }
mapResult.put("list1",list1);
mapResult.put("list2",list2);
mapResult.put("list3",list3);
--
Gitblit v1.9.3