From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Fri, 12 Nov 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/controller/LaboratoryStockMngController.java | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryStockMngController.java
index cf861c5..13743de 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryStockMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryStockMngController.java
@@ -108,17 +108,17 @@
@Override
public OpeReagentStatus getRowData(String rowKey) {
- Iterator<OpeReagentStatus> iterator = this.iterator();
- if (iterator != null) {
- OpeReagentStatus su = null;
- while (iterator.hasNext()) {
- su = iterator.next();
- if (rowKey.equals(su.getId())) {
- return su;
- }
- }
- }
- return null;
+// Iterator<OpeReagentStatus> iterator = this.iterator();
+// if (iterator != null) {
+// OpeReagentStatus su = null;
+// while (iterator.hasNext()) {
+// su = iterator.next();
+// if (rowKey.equals(su.getId())) {
+// return su;
+// }
+// }
+// }
+ return null;
}
};
}
@@ -144,22 +144,23 @@
} catch (Exception e) {
logger.error(e);
}
+ selectedStoreList = null;
return list;
}
@Override
public OpeReagentStatus getRowData(String rowKey) {
- Iterator<OpeReagentStatus> iterator = this.iterator();
- if (iterator != null) {
- OpeReagentStatus su = null;
- while (iterator.hasNext()) {
- su = iterator.next();
- if (rowKey.equals(su.getId())) {
- return su;
- }
- }
- }
- return null;
+// Iterator<OpeReagentStatus> iterator = this.iterator();
+// if (iterator != null) {
+// OpeReagentStatus su = null;
+// while (iterator.hasNext()) {
+// su = iterator.next();
+// if (rowKey.equals(su.getId())) {
+// return su;
+// }
+// }
+// }
+ return opeReagentStatusService.getOpeReagentStatus(rowKey);
}
};
}
--
Gitblit v1.9.2