From a3de8fe47c3eddc8cb086803db68c1bd0cd7c1b7 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期三, 03 二月 2021 16:10:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/controller/OrderMngController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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..c1f72a4 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) {
--
Gitblit v1.9.2