提交

孔祥富

2021-03-07 21c231798d12d9940ec872598f8fbc4f45f393fc

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java

@@ -69,9 +69,15 @@
        if (StringUtils.isNotBlank(empWorkexperience.getJobContent())) {
            queryWrapper.like("a.jobContent", empWorkexperience.getJobContent());
        }
        if (StringUtils.isNotBlank(empWorkexperience.getEmpStatus())) {
            queryWrapper.in("a.EmpStatus", empWorkexperience.getEmpStatus().split(","));
        } else {
            queryWrapper.in("a.EmpStatus", 0);
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));

        Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());

        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts());
        return this.empWorkexperienceMapper.selectPageVo(page, queryWrapper);
    }

@@ -79,6 +85,9 @@
    public List<EmpWorkExperience> findEmpWorkExperiences(EmpWorkExperience empWorkexperience) {
        LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpWorkExperience::getDelFlag,empWorkexperience.getDelFlag());
        if(StringUtils.isNotBlank(empWorkexperience.getEmpNumb())){
            queryWrapper.eq(EmpWorkExperience::getEmpNumb,empWorkexperience.getEmpNumb());
        }
        return this.baseMapper.selectList(queryWrapper);
    }