qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no.4131666 支持设置多个扣缴义务人管理员

This commit is contained in:
钱涛 2026-02-25 10:10:47 +08:00
parent 9978d31c82
commit 2887d49ad0
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resource/WEB-INF/prop/hrmSalary.properties
View File

@ -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

13
src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
View File

@ -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<TaxAgentPO> 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<TaxAgentPO> individualTaxWithholdingAgents = getTaxAgentMapper().listByName(saveParam.getName());
boolean nameExist = individualTaxWithholdingAgents.stream().anyMatch(e -> !Objects.equals(e.getId(), saveParam.getId()));