Merge remote-tracking branch 'origin/master'

李宇

2021-11-12 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa

 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());