From df47c9300bfe6c641c88707aa5b54591ab4c004c Mon Sep 17 00:00:00 2001 From: lyfO_o <764716047@qq.com> Date: 星期五, 11 六月 2021 15:18:58 +0800 Subject: [PATCH] 订单领取:过期处理(确认和过期 状态处理),增加状态过期(需要将数据库字段加长) 实验室选中问题 仓库领取的仓库不存在问题 --- 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