luoyb
2024-06-02 f4151abee349597ed58a405a8a5e48a5d1a1f7a6
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
@@ -73,12 +73,15 @@
            queryWrapper.like("b.allDeptName", empLeaveinfo.getDeptName());
        }
        if (StringUtils.isNotBlank(empLeaveinfo.getEmpStatus())) {
            queryWrapper.in("a.EmpStatus", empLeaveinfo.getEmpStatus().split(","));
            queryWrapper.in("b.EmpStatus", empLeaveinfo.getEmpStatus().split(","));
        }
        if (StringUtils.isNotBlank(empLeaveinfo.getLeaveDateStr())) {
           queryWrapper.ge("a.BeginTime", empLeaveinfo.getLeaveDateStr().split(",")[0]);
           queryWrapper.le("a.EndTime", empLeaveinfo.getLeaveDateStr().split(",")[1]);
        }
        if(StringUtils.isNotBlank(empLeaveinfo.getLeaveType())){
            queryWrapper.eq("a.leaveType", empLeaveinfo.getLeaveType());
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpLeaveInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "beginTime", FebsConstant.ORDER_ASC, true);