yz
2021-05-28 511a66546a655c9e5b44317ca82ae60fe5f2bf0d
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -536,7 +536,7 @@
            }
            if (StringUtils.isNotBlank(list.get(11).toString())) {
                empBaseInfo.setEntryDate(DateUtil.parseDate(list.get(11).toString()));
                empBaseInfo.setEntryDate(DateUtil.parse(list.get(11).toString()));
            }
            //最高学历
@@ -1140,6 +1140,19 @@
            });
            //queryWrapper.in("a.dimissionType", empBaseInfo.getDimissionType().split(","));
        }
        if (StringUtils.isNotBlank(empBaseInfo.getCertificateList())) {
            String[] certificates = empBaseInfo.getCertificateList().split(",");
            Consumer<QueryWrapper<EmpBaseInfo>> consumer = new Consumer<QueryWrapper<EmpBaseInfo>>() {
                @Override
                public void accept(QueryWrapper<EmpBaseInfo> wrapper) {
                    for (int i = 0; i < certificates.length; i++) {
                        String ageBtn = certificates[i];
                        wrapper.or().like("a.certificateList", ageBtn);
                    }
                }
            };
            queryWrapper.and(consumer);
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        return queryWrapper;
    }
@@ -1366,4 +1379,14 @@
        }
        return tempName;
    }
    @Override
    public boolean updateSeniority() {
        return empBaseInfoMapper.updateSeniority()>0;
    }
    @Override
    public boolean updateDeptName() {
        return empBaseInfoMapper.updateDeptName()>0;
    }
}