From 44546c7c5f41b670f18cc520a9b863973ecf3b25 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期二, 22 八月 2023 17:12:22 +0800
Subject: [PATCH] lnl，bug修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java
index 312686b..77d76e5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -58,7 +59,7 @@
@Autowired
private IEamEquipmentService equipmentService;
-
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -92,7 +93,7 @@
IPage<EquipmentUnseal> pageList = equipmentUnsealService.page(page, queryWrapper);
return Result.OK(pageList);
}
-
+
/**
* 娣诲姞
*
@@ -109,7 +110,7 @@
equipmentUnsealService.saveMain(equipmentUnseal, equipmentUnsealPage.getEquipmentUnsealDetailList());
return Result.OK("娣诲姞鎴愬姛锛�");
}
-
+
/**
* 缂栬緫
*
@@ -130,7 +131,7 @@
equipmentUnsealService.updateMain(equipmentUnseal, equipmentUnsealPage.getEquipmentUnsealDetailList());
return Result.OK("缂栬緫鎴愬姛!");
}
-
+
/**
* 閫氳繃id鍒犻櫎
*
@@ -145,7 +146,7 @@
equipmentUnsealService.delMain(id);
return Result.OK("鍒犻櫎鎴愬姛!");
}
-
+
/**
* 鎵归噺鍒犻櫎
*
@@ -160,7 +161,7 @@
this.equipmentUnsealService.delBatchMain(Arrays.asList(ids.split(",")));
return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
}
-
+
/**
* 閫氳繃id鏌ヨ
*
@@ -178,7 +179,7 @@
return Result.OK(equipmentUnseal);
}
-
+
/**
* 閫氳繃id鏌ヨ
*
@@ -293,7 +294,10 @@
for (EquipmentUnsealDetail record : pageList.getRecords()) {
String equipmentId = record.getEquipmentId();
Equipment equipment = equipmentService.getById(equipmentId);
- record.setEquipmentPhoto(equipment.getEquipmentPhoto());
+ if(ObjectUtils.isNotNull(equipment)&&StringUtils.isNotBlank(equipment.getEquipmentPhoto())){
+ record.setEquipmentPhoto(equipment.getEquipmentPhoto());
+ }
+
}
return Result.OK(pageList);
}
--
Gitblit v1.9.3