From 2887d49ad08eaa58bf376e74df7add63765078ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 25 Feb 2026 10:10:47 +0800 Subject: [PATCH] =?UTF-8?q?no.4131666=20=E6=94=AF=E6=8C=81=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=A4=9A=E4=B8=AA=E6=89=A3=E7=BC=B4=E4=B9=89=E5=8A=A1?= =?UTF-8?q?=E4=BA=BA=E7=AE=A1=E7=90=86=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/WEB-INF/prop/hrmSalary.properties | 2 +- .../salary/service/impl/TaxAgentServiceImpl.java | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/resource/WEB-INF/prop/hrmSalary.properties b/resource/WEB-INF/prop/hrmSalary.properties index f60ec7a4f..a352b3b11 100644 --- a/resource/WEB-INF/prop/hrmSalary.properties +++ b/resource/WEB-INF/prop/hrmSalary.properties @@ -1,5 +1,5 @@ log=false defaultCloseNonStandard149=true AESEncryptScrect=990EB004A1C862721C1513AE90038C9E -version=2.18.1.2412.01 +version=2.18.1.2412.01.s openFormulaForcedEditing=false \ No newline at end of file diff --git a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java index 37e312bdd..b6b0edd2f 100644 --- a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java @@ -30,7 +30,6 @@ import com.engine.salary.entity.taxagent.param.TaxAgentSaveParam; import com.engine.salary.entity.taxagent.po.*; import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum; -import com.engine.salary.entity.taxrate.TaxAgent; import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum; import com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum; import com.engine.salary.enums.taxagent.TaxAgentRoleTypeEnum; @@ -347,9 +346,9 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(106271, "请选择管理员")); } - if (saveParam.getAdminUserIds().size() > 1) { - throw new SalaryRunTimeException("个税扣缴义务人的管理员仅能设置一个!"); - } +// if (saveParam.getAdminUserIds().size() > 1) { +// throw new SalaryRunTimeException("个税扣缴义务人的管理员仅能设置一个!"); +// } List taxAgents = getTaxAgentMapper().listByName(saveParam.getName()); if (CollectionUtils.isNotEmpty(taxAgents)) { @@ -403,9 +402,9 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(106271, "请选择管理员")); } - if (saveParam.getAdminUserIds().size() > 1) { - throw new SalaryRunTimeException( "个税扣缴义务人的管理员仅能设置一个!"); - } +// if (saveParam.getAdminUserIds().size() > 1) { +// throw new SalaryRunTimeException( "个税扣缴义务人的管理员仅能设置一个!"); +// } List individualTaxWithholdingAgents = getTaxAgentMapper().listByName(saveParam.getName()); boolean nameExist = individualTaxWithholdingAgents.stream().anyMatch(e -> !Objects.equals(e.getId(), saveParam.getId()));