From cf6b965a86065a537a40c74f67e88a04447d2582 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期一, 12 七月 2021 18:00:38 +0800
Subject: [PATCH] 修改导入申购

---
 src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
index 5534258..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);
 				}
 			};
 		}

--
Gitblit v1.9.2