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/RoleMngController.java |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/controller/RoleMngController.java b/src/main/java/com/nanometer/smartlab/controller/RoleMngController.java
index 1bb893a..2fe14e7 100644
--- a/src/main/java/com/nanometer/smartlab/controller/RoleMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/RoleMngController.java
@@ -14,6 +14,7 @@
 import org.springframework.stereotype.Controller;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -221,6 +222,7 @@
                         if (count > 0) {
                             list = baseRoleService.getBaseRoleList(null, null, first, pageSize);
                         }
+                        selectedList = new ArrayList<>();
                     } catch (Exception e) {
                         logger.error(e);
                     }
@@ -229,17 +231,18 @@
 
                 @Override
                 public BaseRole getRowData(String rowKey) {
-                    Iterator<BaseRole> iterator = this.iterator();
-                    if (iterator != null) {
-                        BaseRole br = null;
-                        while (iterator.hasNext()) {
-                            br = iterator.next();
-                            if (rowKey.equals(br.getId())) {
-                                return br;
-                            }
-                        }
-                    }
-                    return null;
+//                    Iterator<BaseRole> iterator = this.iterator();
+//                    if (iterator != null) {
+//                        BaseRole br = null;
+//                        while (iterator.hasNext()) {
+//                            br = iterator.next();
+//                            if (rowKey.equals(br.getId())) {
+//                                return br;
+//                            }
+//                        }
+//                    }
+                    Long id=Long.valueOf(rowKey);
+                    return baseRoleService.getBaseRole(id);
                 }
             };
         }

--
Gitblit v1.9.2