From 19a5be30c6229dde4adeb2502bc65b2e9a82e9ec Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 三月 2024 11:42:33 +0800
Subject: [PATCH] xg

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
index 061f00a..0598abc 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
@@ -478,7 +478,7 @@
                 record.setEquipmentModel(equipment.getModel());
                 record.setEquipmentSpecification(equipment.getSpecification());
                 record.setEquipmentImportance(equipment.getEquipmentImportanceId());
-                record.setUseDepartName(depart.getDepartName());
+                record.setUseDepartName(ObjectUtils.isNotNull(depart)?depart.getDepartName():"");
             }
 //            List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId);
 //            record.setPrecisionParameterList(precisionParameterList);

--
Gitblit v1.9.3