From 1d6d68d6643f845f8894294d7ee2269670222e6e Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 23 八月 2023 18:03:42 +0800
Subject: [PATCH] lnl,设备台账导入+页面调整
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProcessParametersTemplateController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProcessParametersTemplateController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProcessParametersTemplateController.java
index 09656ff..c56a186 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProcessParametersTemplateController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProcessParametersTemplateController.java
@@ -4,6 +4,8 @@
import com.alibaba.fastjson.JSONObject;
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.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,6 +17,7 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.ProcessParameters;
+import org.jeecg.modules.eam.entity.ProcessParametersCategory;
import org.jeecg.modules.eam.entity.ProcessParametersTemplate;
import org.jeecg.modules.eam.entity.ProcessParametersTemplateDetail;
import org.jeecg.modules.eam.service.IProcessParametersCategoryService;
@@ -81,7 +84,13 @@
processParametersTemplateDetail.setProcessParametersNum(processParameters.getNum());
processParametersTemplateDetail.setProcessParametersName(processParameters.getName());
if(processParameters != null){
- processParametersTemplateDetail.setProcessParametersCategory(processParametersCategoryService.getById(processParameters.getProcessParametersCategoryId()).getName());
+ String id = processParameters.getProcessParametersCategoryId();
+ if(StringUtils.isNotBlank(id)){
+ ProcessParametersCategory processParametersCategory = processParametersCategoryService.getById(id);
+ if(ObjectUtils.isNotNull(processParametersCategory)&&StringUtils.isNotBlank(processParametersCategory.getName())){
+ processParametersTemplateDetail.setProcessParametersCategory(processParametersCategory.getName());
+ }
+ }
}else{
processParametersTemplateDetail.setProcessParametersCategory("/");
}
--
Gitblit v1.9.3