申购管理的审批者--》如果申购人有课题组查到的审批者为申购人所在部门+所在课题组+是审批者+人员有效的以及申购人所在部门+无课题组+是审批者+人员有效...

李宇

2021-10-26 648449c0dc1db4531889a4689d45f0a442032d3a

申购管理的审批者--》如果申购人有课题组查到的审批者为申购人所在部门+所在课题组+是审批者+人员有效的以及申购人所在部门+无课题组+是审批者+人员有效的。如果申购人没有课题组查到的是申购人所在部门+是审批者+人员有效的

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

 src/main/java/com/nanometer/smartlab/controller/BaseController.java

@@ -55,4 +55,12 @@
        }
        return null;
    }

    public String getUserProject() {
        SysUser user = this.getUser();
        if (user != null) {
            return user.getProject();
        }
        return null;
    }
}

 src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml

@@ -146,7 +146,16 @@
    select DISTINCT su.*, br.name as roleName from sys_user as su
    left join base_role as br on su.role_id = br.id inner join sys_project as sp on su.id=sp.sys_user_id
    where su.valid_flag = 1
    <include refid="queryWhereSql"/>
      <if test="department != null and department != ''">
          and su.department = #{department}
      </if>
      <if test="approverFlag != null">
          and su.approver_flag = #{approverFlag}
      </if>
      <if test="project != null and project != ''">
          and (su.project like concat('%',#{project},'%')
          or su.project is null or su.project = '')
      </if>
    order by su.arp ASC
    <if test="first != null and pageSize != null">
      limit #{first}, #{pageSize}

 src/main/java/com/nanometer/smartlab/service/SysUserService.java

@@ -24,7 +24,7 @@
    SysUser getSysUserByIdCard(String idCard);
    boolean isSysUserExist(String arp, String account, String idCard, String editId);
    List<SysUser> getApproverUserList(String department);
    List<SysUser> getHasProjectSysUserList(String department);
    List<SysUser> getHasProjectSysUserList(String department,String project);
    List<SysUser> getApplyUserList();
    List<SysUser> getSeeUserList(String department);
    SysUser insertSysUser(SysUser sysUser);

 src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java

@@ -192,10 +192,11 @@
    }

    @Override
    public List<SysUser> getHasProjectSysUserList(String department) {
    public List<SysUser> getHasProjectSysUserList(String department, String project) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            params.put("department", department);
            params.put("project", project);
            params.put("approverFlag", ApproverFlag.YES);
            return this.sysUserDao.getHasProjectSysUserList(params);
        } catch (DataAccessException e) {