From a1e90c3da21d88f994bac9c1feb91bf40e53a44d Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 18 八月 2021 13:01:21 +0800
Subject: [PATCH] 耗材无供应商也显示，申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材
---
src/main/java/com/nanometer/smartlab/controller/BaseMetaController.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/BaseMetaController.java b/src/main/java/com/nanometer/smartlab/controller/BaseMetaController.java
index 8eacdd8..c68aade 100644
--- a/src/main/java/com/nanometer/smartlab/controller/BaseMetaController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/BaseMetaController.java
@@ -131,6 +131,7 @@
if (count > 0) {
list = baseMetaService.getBaseMetaList(groupId, keyword, first, pageSize);
}
+ selectedList = new ArrayList<>();
} catch (Exception e) {
logger.error(e);
}
@@ -139,17 +140,17 @@
@Override
public BaseMeta getRowData(String rowKey) {
- Iterator<BaseMeta> iterator = this.iterator();
- if (iterator != null) {
- BaseMeta bm = null;
- while (iterator.hasNext()) {
- bm = iterator.next();
- if (rowKey.equals(bm.getId())) {
- return bm;
- }
- }
- }
- return null;
+// Iterator<BaseMeta> iterator = this.iterator();
+// if (iterator != null) {
+// BaseMeta bm = null;
+// while (iterator.hasNext()) {
+// bm = iterator.next();
+// if (rowKey.equals(bm.getId())) {
+// return bm;
+// }
+// }
+// }
+ return baseMetaService.getBaseMeta(rowKey);
}
};
}
--
Gitblit v1.9.2