From a1e90c3da21d88f994bac9c1feb91bf40e53a44d Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Wed, 18 Aug 2021 13:01:21 +0800
Subject: [PATCH] 耗材无供应商也显示,申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材
---
src/main/java/com/nanometer/smartlab/controller/SysFileMngController.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/SysFileMngController.java b/src/main/java/com/nanometer/smartlab/controller/SysFileMngController.java
index 3e814ad..fe9dcb5 100644
--- a/src/main/java/com/nanometer/smartlab/controller/SysFileMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/SysFileMngController.java
@@ -22,10 +22,7 @@
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Controller
@Scope("session")
@@ -259,6 +256,7 @@
if (count > 0) {
list = sysFileService.getSysFileList(name,first, pageSize);
}
+ selectedList = new ArrayList<>();
} catch (Exception e) {
logger.error(e);
}
@@ -267,17 +265,17 @@
@Override
public SysFile getRowData(String rowKey) {
- Iterator<SysFile> iterator = this.iterator();
- if (iterator != null) {
- SysFile br = null;
- while (iterator.hasNext()) {
- br = iterator.next();
- if (rowKey.equals(br.getId())) {
- return br;
- }
- }
- }
- return null;
+// Iterator<SysFile> iterator = this.iterator();
+// if (iterator != null) {
+// SysFile br = null;
+// while (iterator.hasNext()) {
+// br = iterator.next();
+// if (rowKey.equals(br.getId())) {
+// return br;
+// }
+// }
+// }
+ return sysFileService.getSysFileById(rowKey);
}
};
}
--
Gitblit v1.9.2