lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-01-25 07:46:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
lihongjie0209
2024-03-20 17:10:41 +08:00
parent 3f90b799bc
commit 29c9691238
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/cn/lihongjie/coal/empSalaryItemConfig/service/EmpSalaryItemConfigService.java
View File

@@ -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<EmpSalaryItemEntity> items = empSalaryItemService.findAll(
new Specification<EmpSalaryItemEntity>() {
List<EmpSalaryStandardEntity> items = empSalaryStandardService.findAll(
new Specification<EmpSalaryStandardEntity>() {
@Override
public Predicate toPredicate(
Root<EmpSalaryItemEntity> root,
Root<EmpSalaryStandardEntity> 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"));
}