diff --git a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java index 3031ffeae..3c30540a4 100644 --- a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java @@ -32,7 +32,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import weaver.hrm.User; @@ -435,7 +434,7 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService ValidUtil.doValidator(param); // 获取薪资项目信息 SalaryItemPO salaryItemPO = salaryItemBiz.getById(param.getSalaryItemId()); - if (ObjectUtils.isEmpty(salaryItemPO)) { + if (salaryItemPO == null) { throw new SalaryRunTimeException("薪资项目不存在或已被删除"); } // 获取薪资账套中薪资项目信息 diff --git a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java index c4e27cdea..d954fd240 100644 --- a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java @@ -27,7 +27,6 @@ import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.valid.ValidUtil; import dm.jdbc.util.IdGenerator; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import weaver.general.BaseBean; @@ -646,7 +645,7 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe private SalaryItemPO checkItemExists(Long salaryItemId, Map salaryItemsMap) { SalaryItemPO salaryItemPO = salaryItemsMap.get(salaryItemId); - if (ObjectUtils.isEmpty(salaryItemPO)){ + if (salaryItemPO != null) { throw new SalaryRunTimeException("保存失败!存在薪资项目不存在或已被删除"); } return salaryItemPO; @@ -737,7 +736,7 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe SalarySobItemFormDTO salarySobItemFormDTO = new SalarySobItemFormDTO(); salarySobItemFormDTO.setCanEdit(1); // 默认可以编辑 - if (ObjectUtils.isNotEmpty(param.getSalarySobId()) && ObjectUtils.isNotEmpty(param.getSalaryItemId())) { + if (param.getSalarySobId() != null && param.getSalaryItemId() != null) { // 查询薪资账套 SalarySobPO salarySobPO = salarySobBiz.getById(param.getSalarySobId()); if (Objects.isNull(salarySobPO)) { @@ -745,19 +744,19 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe } // 查询薪资项目 List salarySobItemPOS = getSalarySobItemMapper().listSome(SalarySobItemPO.builder().salarySobId(param.getSalarySobId()).salaryItemId(param.getSalaryItemId()).build()); - if (CollectionUtils.isEmpty(salarySobItemPOS)){ + if (CollectionUtils.isEmpty(salarySobItemPOS)) { throw new SalaryRunTimeException("账套中薪资项目不存在"); } SalarySobItemPO salarySobItemPO = salarySobItemPOS.get(0); SalaryItemPO salaryItemPO = getSalaryItemService(user).getById(salarySobItemPO.getSalaryItemId()); - if (ObjectUtils.isEmpty(salaryItemPO)){ + if (salaryItemPO == null) { throw new SalaryRunTimeException("薪资项目不存在或已被删除"); } //获取系统值 List salarySobDefaultItemPOS = getSalarySobDefaultItemMapper().listAll(); salarySobDefaultItemPOS = salarySobDefaultItemPOS.stream().filter(po -> po.getSysSalaryItemId() != 0).collect(Collectors.toList()); Map longIntegerMap = SalaryEntityUtil.convert2Map(salarySobDefaultItemPOS, SalarySobDefaultItemPO::getSysSalaryItemId, SalarySobDefaultItemPO::getCanDelete); - if (salaryItemPO.getSysSalaryItemId() != null){ + if (salaryItemPO.getSysSalaryItemId() != null) { salarySobItemPO.setCanDelete(longIntegerMap.getOrDefault(salaryItemPO.getSysSalaryItemId(), 1)); } // 获取薪资项目公式 @@ -773,14 +772,14 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe .build()); String formulaContent = CollectionUtils.isEmpty(expressFormulas) ? "" : expressFormulas.get(0).getFormula(); - Integer valueType = ObjectUtils.isEmpty(salarySobItemPO.getValueType()) ? salaryItemPO.getValueType() : salarySobItemPO.getValueType(); + Integer valueType = salarySobItemPO.getValueType() == null ? salaryItemPO.getValueType() : salarySobItemPO.getValueType(); salarySobItemFormDTO .setId(salarySobItemPO.getId()) .setName(salaryItemPO.getName()) .setItemHide(hideItemIds.contains(salaryItemPO.getId()) ? 1 : 0) .setDataType(salaryItemPO.getDataType()) - .setRoundingMode(ObjectUtils.isEmpty(salarySobItemPO.getRoundingMode()) ? salaryItemPO.getRoundingMode() : salarySobItemPO.getRoundingMode()) - .setPattern(ObjectUtils.isEmpty(salarySobItemPO.getPattern()) ? salaryItemPO.getPattern() : salarySobItemPO.getPattern()) + .setRoundingMode(salarySobItemPO.getRoundingMode() == null ? salaryItemPO.getRoundingMode() : salarySobItemPO.getRoundingMode()) + .setPattern(salarySobItemPO.getPattern() == null ? salaryItemPO.getPattern() : salarySobItemPO.getPattern()) .setValueType(valueType) .setFormulaId(salarySobItemPO.getFormulaId()) .setFormulaContent(CollectionUtils.isNotEmpty(expressFormulas) ? formulaContent : "")