From ea2b42d0ab6cd96118ddb030bbc3901149d6aaa7 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Wed, 27 Oct 2021 16:59:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java b/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java
index b7ebec2..d2bc3cd 100644
--- a/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java
@@ -143,7 +143,7 @@
}
public void initApproveUserSelectList() {
- this.approveUserSelectList = this.sysUserService.getHasProjectSysUserList(this.getUserDepartment());
+ this.approveUserSelectList = this.sysUserService.getHasProjectSysUserList(this.getUserDepartment(),this.getUserProject());
if (!CollectionUtils.isEmpty(this.approveUserSelectList)){
if(this.selectedList == null){
this.sysProjectList = sysProjectService.getSysProjectList(this.approveUserSelectList.get(0).getId());
--
Gitblit v1.9.2