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/OrderMngController.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/OrderMngController.java b/src/main/java/com/nanometer/smartlab/controller/OrderMngController.java
index 6f8d843..fb2d3ff 100644
--- a/src/main/java/com/nanometer/smartlab/controller/OrderMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/OrderMngController.java
@@ -63,8 +63,13 @@
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())){
+ userSelectList.add(0, userSelectList.remove(i));
+ }
+ }
this.warehouseList = this.sysWarehouseService.getSysWarehouseList(null, null, null, null);
this.warehouseNameMap = new HashMap<String, String>();
if (this.warehouseList != null && this.warehouseList.size() > 0) {
@@ -285,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