From 648449c0dc1db4531889a4689d45f0a442032d3a Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期二, 26 十月 2021 17:05:35 +0800
Subject: [PATCH] 申购管理的审批者--》如果申购人有课题组查到的审批者为申购人所在部门+所在课题组+是审批者+人员有效的以及申购人所在部门+无课题组+是审批者+人员有效的。如果申购人没有课题组查到的是申购人所在部门+是审批者+人员有效的

---
 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