diff --git a/src/com/engine/salary/biz/AddUpSituationBiz.java b/src/com/engine/salary/biz/AddUpSituationBiz.java index 2144ef542..6b5c4e7d6 100644 --- a/src/com/engine/salary/biz/AddUpSituationBiz.java +++ b/src/com/engine/salary/biz/AddUpSituationBiz.java @@ -124,7 +124,7 @@ public class AddUpSituationBiz extends BaseBean { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { AddUpSituationMapper mapper = sqlSession.getMapper(AddUpSituationMapper.class); - AddUpSituationEncrypt.decryptAddUpSituationList(param); + AddUpSituationEncrypt.encryptAddUpSituationList(param); List> partition = Lists.partition(param, 100); partition.forEach(mapper::updateData); sqlSession.commit(); diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java index 7ea86353e..3aee39f9f 100644 --- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java @@ -293,7 +293,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction } else { //个税扣缴义务人不存在 Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowIndex + "个税扣缴义务人不存在"); + errorMessageMap.put("message", rowIndex + "个税扣缴义务人不存在或不在权限范围内"); errorData.add(errorMessageMap); errorSum += 1; } diff --git a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java index 4b1bf0bc3..72514e07c 100644 --- a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java @@ -666,7 +666,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation } else { //个税扣缴义务人不存在 Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowIndex + "个税扣缴义务人不存在"); + errorMessageMap.put("message", rowIndex + "个税扣缴义务人不存在或不在权限范围内"); errorData.add(errorMessageMap); errorSum += 1; } diff --git a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java index 6c11539e9..8ed805d6f 100644 --- a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java @@ -272,7 +272,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction } else { //个税扣缴义务人不存在 Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowIndex + "个税扣缴义务人不存在"); + errorMessageMap.put("message", rowIndex + "个税扣缴义务人不存在或不在权限范围内"); errorData.add(errorMessageMap); errorSum += 1; } diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index 6afd689ea..621bb4eb3 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -959,7 +959,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe Set taxAgents = SalaryEntityUtil.properties(taxAgentList, TaxAgentPO::getId); if (taxAgentId == null) { Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowindex + "个税扣缴义务人不存在"); + errorMessageMap.put("message", rowindex + "个税扣缴义务人不存在或不在权限范围内"); excelComments.add(errorMessageMap); isError = true; } else if (!taxAgents.contains(taxAgentId)) { diff --git a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java index 58ff90b3c..59c56fa52 100644 --- a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java @@ -364,7 +364,7 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM // 查询薪资账套 TaxAgentPO taxAgent = getTaxAgentV2Service(user).getById(saveParam.getTaxAgentId()); if (Objects.isNull(taxAgent)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(108605, "参数错误,个税扣缴义务人不存在或者已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(108605, "参数错误,个税扣缴义务人不存在或不在权限范围内")); } // 查询已有的管理范围 List taxAgentManageAllRanges = listByTaxAgentId(saveParam.getTaxAgentId()); diff --git a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java index d30b96be4..064ef5d19 100644 --- a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java @@ -344,7 +344,7 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService { TaxAgentPO taxAgent = getById(saveParam.getId()); if (taxAgent == null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100545, "个税扣缴义务人不存在")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100545, "个税扣缴义务人不存在或不在权限范围内")); } // 是否开启分权 boolean isOpenDevolution = getTaxAgentBaseService(user).isOpenDevolution();