提交

src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java

@@ -3481,9 +3481,10 @@ public class SalaryManagementController {
 				XcglAssoBszqsz bssz = XcglAssoBszqsz.builder().build().selectOne(new QueryWrapper<XcglAssoBszqsz>().lambda().eq(XcglAssoBszqsz::getQyid, orgCode));
 				XcglAssoBszqsz bssz = XcglAssoBszqsz.builder().build().selectOne(new QueryWrapper<XcglAssoBszqsz>().lambda().eq(XcglAssoBszqsz::getQyid, orgCode));
 				String taxmonth = "";
 				String taxmonth = "";
 				if(bssz.getTaxReturnCycle().equals(1)) {
 				if(bssz.getTaxReturnCycle().equals(1)) {
-					taxmonth = indv.getTaxMonth();
+//					taxmonth = indv.getTaxMonth();
+					taxmonth = indv.getSalaryMonth();
 				}else{
 				}else{
-					taxmonth = SalaryTool.getfirstnextMo(indv.getTaxMonth()+"-01 00:00:00");
+					taxmonth = SalaryTool.getfirstnextMo(indv.getSalaryMonth()+"-01 00:00:00");
 				}
 				}
 				YgglMainEmp ygl = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getName, userName)
 				YgglMainEmp ygl = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getName, userName)
 						.eq(YgglMainEmp::getPhone, phone).eq(YgglMainEmp::getOrgCode, orgCode));
 						.eq(YgglMainEmp::getPhone, phone).eq(YgglMainEmp::getOrgCode, orgCode));