Commit ed245bb1 by ilal Committed by chenzg

提交

parent 76449e36
...@@ -632,12 +632,12 @@ public class SalaryManagementController { ...@@ -632,12 +632,12 @@ public class SalaryManagementController {
.rule(modifysalaryruledto.getFormula()).rulestate(3).id(modifysalaryruledto.getJsgzzxid()).build().updateById(); .rule(modifysalaryruledto.getFormula()).rulestate(3).id(modifysalaryruledto.getJsgzzxid()).build().updateById();
}else { }else {
XcglAssoJsgzzx.builder().gsid(modifysalaryruledto.getXcjsgzid()).gsgs(modifysalaryruledto.getFormula()) XcglAssoJsgzzx.builder().gsid(modifysalaryruledto.getXcjsgzid()).gsgs(modifysalaryruledto.getFormula())
.rule(modifysalaryruledto.getFormula()).rulestate(xcjsgz.getOptionid()).id(modifysalaryruledto.getJsgzzxid()).build().updateById(); .rule(modifysalaryruledto.getFormula()).rulestate(xcjsgz.getRulestate()).id(modifysalaryruledto.getJsgzzxid()).build().updateById();
} }
}else { }else {
XcglAssoJsgzzx.builder().gsid(modifysalaryruledto.getXcjsgzid()).gsgs(modifysalaryruledto.getFormula()) XcglAssoJsgzzx.builder().gsid(modifysalaryruledto.getXcjsgzid()).gsgs(modifysalaryruledto.getFormula())
.dygk(modifysalaryruledto.getDygk()).degk(modifysalaryruledto.getDegk()) .dygk(modifysalaryruledto.getDygk()).degk(modifysalaryruledto.getDegk())
.rule(modifysalaryruledto.getFormula()).rulestate(xcjsgz.getOptionid()) .rule(modifysalaryruledto.getFormula()).rulestate(xcjsgz.getRulestate())
.id(modifysalaryruledto.getJsgzzxid()).build().updateById(); .id(modifysalaryruledto.getJsgzzxid()).build().updateById();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment