From e57dc5878ff7170e2a8d8da145289ad1abcd70f8 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Thu, 28 Jan 2021 16:47:52 +0800
Subject: [PATCH] 申领人实验室搜索逻辑修改 ->优先课题组下的实验室，如果没有则搜索部门下的实验室
---
src/main/java/com/nanometer/smartlab/controller/OrderMngController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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..730bec7 100644
--- a/src/main/java/com/nanometer/smartlab/controller/OrderMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/OrderMngController.java
@@ -64,7 +64,12 @@
public void initRukuPage() {
this.userSelectList = this.sysUserService.getSysUserList(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