From e8a3e262f0c129e02f08a2b1ba15bcbb9a733d51 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 25 六月 2021 16:34:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
index f00e5f5..8744fd6 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
@@ -290,6 +290,9 @@
}
valuesList.add(cellInfo);
}
+ if (valuesList.size() != 10){
+ break;
+ }
System.out.println("value : "+valuesList);
SysLaboratoryContainer sysLaboratoryContainer=new SysLaboratoryContainer();
sysLaboratoryContainer.setLaboratoryId(getLabId(sysLaboratories,valuesList.get(0)));
@@ -471,10 +474,8 @@
}
public List<SysController> getControllers() {
- if(controllers == null)
- {
this.controllers = sysControllerService.getAllControllerList();
- }
+
return controllers;
}
--
Gitblit v1.9.2