From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Fri, 12 Nov 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/controller/SysControllerMngController.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/SysControllerMngController.java b/src/main/java/com/nanometer/smartlab/controller/SysControllerMngController.java
index ba6d579..2f9e897 100644
--- a/src/main/java/com/nanometer/smartlab/controller/SysControllerMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/SysControllerMngController.java
@@ -156,6 +156,7 @@
if (count > 0) {
list = sysControllerService.getSysControllerList(code, name, first, pageSize);
}
+ selectedList = new ArrayList<>();
} catch (Exception e) {
logger.error(e);
}
@@ -164,17 +165,17 @@
@Override
public SysController getRowData(String rowKey) {
- Iterator<SysController> iterator = this.iterator();
- if (iterator != null) {
- SysController br = null;
- while (iterator.hasNext()) {
- br = iterator.next();
- if (Integer.valueOf(rowKey) == br.getId()) {
- return br;
- }
- }
- }
- return null;
+// Iterator<SysController> iterator = this.iterator();
+// if (iterator != null) {
+// SysController br = null;
+// while (iterator.hasNext()) {
+// br = iterator.next();
+// if (Integer.valueOf(rowKey) == br.getId()) {
+// return br;
+// }
+// }
+// }
+ return sysControllerService.getSysController(Integer.parseInt(rowKey));
}
};
}
--
Gitblit v1.9.2