diff --git a/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/service/EmpSalaryItemConfigService.java b/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/service/EmpSalaryItemConfigService.java index b145ee93..cd84c412 100644 --- a/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/service/EmpSalaryItemConfigService.java +++ b/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/service/EmpSalaryItemConfigService.java @@ -11,6 +11,8 @@ import cn.lihongjie.coal.empSalaryItemConfig.dto.UpdateEmpSalaryItemConfigDto; import cn.lihongjie.coal.empSalaryItemConfig.entity.EmpSalaryItemConfigEntity; import cn.lihongjie.coal.empSalaryItemConfig.mapper.EmpSalaryItemConfigMapper; import cn.lihongjie.coal.empSalaryItemConfig.repository.EmpSalaryItemConfigRepository; +import cn.lihongjie.coal.empSalaryStandard.entity.EmpSalaryStandardEntity; +import cn.lihongjie.coal.empSalaryStandard.service.EmpSalaryStandardService; import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; @@ -154,15 +156,17 @@ public class EmpSalaryItemConfigService } + @Autowired private EmpSalaryStandardService empSalaryStandardService; + private void initSalaStandard(String organizationId) { long delete = repository.deleteByOrganizationIdAndItemType(organizationId, "2"); - List items = empSalaryItemService.findAll( - new Specification() { + List items = empSalaryStandardService.findAll( + new Specification() { @Override public Predicate toPredicate( - Root root, + Root root, CriteriaQuery query, CriteriaBuilder criteriaBuilder) { return criteriaBuilder.and( @@ -172,7 +176,7 @@ public class EmpSalaryItemConfigService }); - for (EmpSalaryItemEntity item : items) { + for (EmpSalaryStandardEntity item : items) { this.repository.save(createEmpConfig(organizationId, "stdMap[\"" + item.getName() + "\"]", item.getName(),true, "2")); }