From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change

---
 src/main/java/com/nanometer/smartlab/controller/WarehouseMngController.java |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseMngController.java
index 86b00ef..eea1130 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseMngController.java
@@ -1,5 +1,6 @@
 package com.nanometer.smartlab.controller;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -54,7 +55,7 @@
 	/**
 	 * 数据模型
 	 */
-	private SysWarehouse sysWarehouse;
+	private SysWarehouse sysWarehouse=new SysWarehouse();
 	/**
 	 * 选中的list
 	 */
@@ -170,6 +171,7 @@
 						if (count > 0) {
 							list = sysWarehouseService.getSysWarehouseList(type, name, first, pageSize);
 						}
+						selectedList = new ArrayList<>();
 					} catch (Exception e) {
 						logger.error(e);
 					}
@@ -178,17 +180,18 @@
 
 				@Override
 				public SysWarehouse getRowData(String rowKey) {
-					Iterator<SysWarehouse> iterator = this.iterator();
-					if (iterator != null) {
-						SysWarehouse su = null;
-						while (iterator.hasNext()) {
-							su = iterator.next();
-							if (rowKey.equals(su.getId())) {
-								return su;
-							}
-						}
-					}
-					return null;
+//					Iterator<SysWarehouse> iterator = this.iterator();
+//					if (iterator != null) {
+//						SysWarehouse su = null;
+//						while (iterator.hasNext()) {
+//							su = iterator.next();
+//							if (rowKey.equals(su.getId())) {
+//								return su;
+//							}
+//						}
+//					}
+					Long id=Long.valueOf(rowKey);
+					return sysWarehouseService.getSysWarehouse(id);
 				}
 			};
 		}

--
Gitblit v1.9.2