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/SupplierInfoMngController.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/SupplierInfoMngController.java b/src/main/java/com/nanometer/smartlab/controller/SupplierInfoMngController.java
index 923244e..7a19d61 100644
--- a/src/main/java/com/nanometer/smartlab/controller/SupplierInfoMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/SupplierInfoMngController.java
@@ -13,6 +13,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;
@@ -116,6 +117,7 @@
if (count > 0) {
list = sysSupplierService.getSysSupplierList(name, first, pageSize);
}
+ selectedList = new ArrayList<>();
} catch (Exception e) {
logger.error(e);
}
@@ -124,17 +126,17 @@
@Override
public SysSupplier getRowData(String rowKey) {
- Iterator<SysSupplier> iterator = this.iterator();
- if (iterator != null) {
- SysSupplier ss = null;
- while (iterator.hasNext()) {
- ss = iterator.next();
- if (rowKey.equals(ss.getId())) {
- return ss;
- }
- }
- }
- return null;
+// Iterator<SysSupplier> iterator = this.iterator();
+// if (iterator != null) {
+// SysSupplier ss = null;
+// while (iterator.hasNext()) {
+// ss = iterator.next();
+// if (rowKey.equals(ss.getId())) {
+// return ss;
+// }
+// }
+// }
+ return sysSupplierService.getSysSupplier(rowKey);
}
};
}
--
Gitblit v1.9.2