luoyb
2024-09-19 3cadfe55e0dcec2a02786956ad2776258e0e736c
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
@@ -122,7 +122,9 @@
            empContractinfo.setBeginDate(empContractinfo.getSigningDate());
        }
        if(StrUtil.isEmpty(empContractinfo.getSex())){
            EmpBaseInfo empBaseInfo = empBaseInfoService.getById(empContractinfo.getEmpId());
            QueryWrapper<EmpBaseInfo> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("empNumb", empContractinfo.getEmpNumb());
            EmpBaseInfo empBaseInfo = empBaseInfoService.getOne(queryWrapper);
            if(ObjectUtil.isNotEmpty(empBaseInfo)){
                empContractinfo.setSex(empBaseInfo.getSex());
            }
@@ -270,7 +272,7 @@
        queryWrapper.eq("a.DelFlag", empContractinfo.getDelFlag());
        queryWrapper.eq("a.remindFlag", 0);
        queryWrapper.in("a.contractStatus", contractStatus);
        queryWrapper.between("a.diffDay", 0, diffDay);
        queryWrapper.between("a.diffDay", -diffDay, diffDay);
        queryWrapper.ge("a.endDate", DateUtil.formatDate(new Date()));
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));