diff --git a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml index 0a7eea3f8..29bc391c0 100644 --- a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml @@ -70,6 +70,9 @@ salary_item_null_status, salary_item_zero_status, salary_item_setting, + replenish_name, + replenish_rule, + replenish_salary_item_setting, create_time, update_time, creator, diff --git a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java index 554499b46..993d30836 100644 --- a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java @@ -150,10 +150,10 @@ public class SalaryTemplateWrapper extends Service { salaryTemplateBaseSetDTO.setMsgStatus(po.getMsgStatus().equals(SalaryTemplateWhetherEnum.TRUE.getValue())); salaryTemplateBaseSetDTO.setSalarySob(po.getSalarySobId()); salaryTemplateBaseSetDTO.setSendEmail(po.getSendEmailId()); - // 规则赋值 - salaryTemplateBaseSetDTO.setReplenishRule(SalaryTemplateReplenishRuleEnum.ALL.getValue().equals(po.getReplenishRule()) ? po.getReplenishRule() : SalaryTemplateReplenishRuleEnum.BYRULE.getValue()); + // 规则赋值 如果为ALL传“” 如果为byRule传薪资项目ID + salaryTemplateBaseSetDTO.setReplenishRule(SalaryTemplateReplenishRuleEnum.ALL.getValue().equals(po.getReplenishRule()) ? "" : po.getReplenishRule()); // 规则设置赋值 - salaryTemplateBaseSetDTO.setReplenishRuleSet(po.getReplenishRule()); +// salaryTemplateBaseSetDTO.setReplenishRuleSet(po.getReplenishRule()); // 修改时获取补规则设置下拉列表 replenishRuleSetOptionList = getReplenishRuleSetOptions(po.getSalarySobId()); }