From f5ccc7e9ca548c6bddf51ebe8e943fc09a3b2ff4 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 26 一月 2021 18:12:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
index b555f0a..977f2bc 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
@@ -138,10 +138,6 @@
public void onSaveBtnClick() {
try {
- if (!StringUtils.isNotBlank(sysLaboratoryContainer.getProjectId())){
- sysLaboratoryContainer.setProjectId(null);
- }
-
// 新建
if (this.action == Constants.ACTION_ADD) {
if (this.sysLaboratoryContainer == null) {
@@ -215,6 +211,9 @@
return;
}
+ sysLaboratoryContainer.setProject(null);
+ sysLaboratoryContainer.getProject();
+
this.sysLaboratoryContainerService.updateSysLaboratoryContainer(sysLaboratoryContainer);
FacesUtils.info("修改成功。");
--
Gitblit v1.9.2