提交

f6bf3b1b · ilal · 4b314a4e · f6bf3b1b
Commit f6bf3b1b authored Oct 20, 2020 by ilal
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+2 -2

No files found.
--- a/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+++ b/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
@@ -632,12 +632,12 @@ public class SalaryManagementController {
 					.rule(modifysalaryruledto.getFormula()).rulestate(3).id(modifysalaryruledto.getJsgzzxid()).build().updateById();
 			}else {
 				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 {
 			XcglAssoJsgzzx.builder().gsid(modifysalaryruledto.getXcjsgzid()).gsgs(modifysalaryruledto.getFormula())
 					.dygk(modifysalaryruledto.getDygk()).degk(modifysalaryruledto.getDegk())
-					.rule(modifysalaryruledto.getFormula()).rulestate(xcjsgz.getOptionid())
+					.rule(modifysalaryruledto.getFormula()).rulestate(xcjsgz.getRulestate())
 					.id(modifysalaryruledto.getJsgzzxid()).build().updateById();
 		}