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/OrderMngController.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/OrderMngController.java b/src/main/java/com/nanometer/smartlab/controller/OrderMngController.java
index 730bec7..fb2d3ff 100644
--- a/src/main/java/com/nanometer/smartlab/controller/OrderMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/OrderMngController.java
@@ -63,7 +63,7 @@
private Map<String, List<SysWarehouseContainer>> warehouseIdContainerMap;
public void initRukuPage() {
- this.userSelectList = this.sysUserService.getSysUserList(null, null, null, null, null);
+ this.userSelectList = this.sysUserService.getSysUserList(null, null, null, null, null,null,null);
//将admin置于首位
for (int i = 0; i < userSelectList.size(); i++) {
if ("admin".equals(userSelectList.get(i).getAccount())){
@@ -290,22 +290,23 @@
} catch (Exception e) {
logger.error(e);
}
+ selectedList = null;
return list;
}
@Override
public OpeOrder getRowData(String rowKey) {
- Iterator<OpeOrder> iterator = this.iterator();
- if (iterator != null) {
- OpeOrder oo = null;
- while (iterator.hasNext()) {
- oo = iterator.next();
- if (rowKey.equals(oo.getId())) {
- return oo;
- }
- }
- }
- return null;
+// Iterator<OpeOrder> iterator = this.iterator();
+// if (iterator != null) {
+// OpeOrder oo = null;
+// while (iterator.hasNext()) {
+// oo = iterator.next();
+// if (rowKey.equals(oo.getId())) {
+// return oo;
+// }
+// }
+// }
+ return opeOrderService.getOpeOrder(rowKey);
}
};
}
--
Gitblit v1.9.2