From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 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..2650e7a 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)));
@@ -401,6 +404,7 @@
list = sysLaboratoryContainerService.getSysLaboratoryContainerList(laboratoryType,
laboratoryName,null,project,controllerName, first, pageSize);
}
+ selectedList = new ArrayList<> ();
} catch (Exception e) {
logger.error(e);
}
@@ -409,17 +413,17 @@
@Override
public SysLaboratoryContainer getRowData(String rowKey) {
- Iterator<SysLaboratoryContainer> iterator = this.iterator();
- if (iterator != null) {
- SysLaboratoryContainer su = null;
- while (iterator.hasNext()) {
- su = iterator.next();
- if (rowKey.equals(su.getId())) {
- return su;
- }
- }
- }
- return null;
+// Iterator<SysLaboratoryContainer> iterator = this.iterator();
+// if (iterator != null) {
+// SysLaboratoryContainer su = null;
+// while (iterator.hasNext()) {
+// su = iterator.next();
+// if (rowKey.equals(su.getId())) {
+// return su;
+// }
+// }
+// }
+ return sysLaboratoryContainerService.getSysLaboratoryContainer(rowKey);
}
};
}
@@ -471,10 +475,8 @@
}
public List<SysController> getControllers() {
- if(controllers == null)
- {
this.controllers = sysControllerService.getAllControllerList();
- }
+
return controllers;
}
--
Gitblit v1.9.2