From 4ab942df06d2f7d6f2df1102ef5b83d6a1696763 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Mon, 20 Feb 2023 17:14:14 +0800
Subject: [PATCH] 人员文件上传
---
src/main/java/com/nanometer/smartlab/controller/OrderMngController.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 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..1621593 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) {
@@ -181,7 +186,6 @@
}
public void onSaveBtnClick() {
- System.out.println("++++++testIsIn ++++++++++++++++");
try {
if (this.opeOrder == null) {
FacesUtils.warn("订单数据为空。");
@@ -285,22 +289,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