From c3510da29a7974c6af7ff3de1ade3db429d6f848 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 18 八月 2021 14:27:59 +0800
Subject: [PATCH] 申购管理申请履历显示所有历史单据，提交时如有无效试剂耗材报错
---
src/main/java/com/nanometer/smartlab/controller/RoleMngController.java | 24 +++++++++++++-----------
1 files changed, 13 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..a19fb88 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,17 @@
@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;
+// }
+// }
+// }
+ return baseRoleService.getBaseRole(rowKey);
}
};
}
--
Gitblit v1.9.2