修改问题

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

@@ -1244,7 +1244,7 @@ public class SalaryManagementController {
 	 */
 	 */
 	@GetMapping(value = "/payrulegroupitem/{id}/{xzyf}")
 	@GetMapping(value = "/payrulegroupitem/{id}/{xzyf}")
 	@ApiOperation(value = "获取计薪规则组项", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperation(value = "获取计薪规则组项", httpMethod = "GET", notes = "接口发布说明")
-	public ResponseResult Payrulegroupitem(@CurrentUser UserBean userBean,@PathVariable Integer id,@PathVariable String xzyf) {
+	public ResponseResult Payrulegroupitem(@CurrentUser UserBean userBean,@PathVariable Integer id) {
 		SalaryFieldDto salfie = new SalaryFieldDto();
 		SalaryFieldDto salfie = new SalaryFieldDto();
 		List<XcglAssoJsgzzx> jsgzzxlist = new LambdaQueryChainWrapper<XcglAssoJsgzzx>(xcglassojsgzzxmapper).eq(XcglAssoJsgzzx::getXzzid, id).eq(XcglAssoJsgzzx::getType,2).list();
 		List<XcglAssoJsgzzx> jsgzzxlist = new LambdaQueryChainWrapper<XcglAssoJsgzzx>(xcglassojsgzzxmapper).eq(XcglAssoJsgzzx::getXzzid, id).eq(XcglAssoJsgzzx::getType,2).list();
 		List<CalculatedFieldDto> fielist = new ArrayList<CalculatedFieldDto>();
 		List<CalculatedFieldDto> fielist = new ArrayList<CalculatedFieldDto>();
@@ -1277,7 +1277,7 @@ public class SalaryManagementController {
 //		}
 //		}
 		CheckSalaryStaffDto checksalary = new CheckSalaryStaffDto();
 		CheckSalaryStaffDto checksalary = new CheckSalaryStaffDto();
 		checksalary.setPaygroupid(id);
 		checksalary.setPaygroupid(id);
-		checksalary.setXzyf(xzyf);
+		// checksalary.setXzyf(xzyf);
 		checksalary.setOrgcode(userBean.getOrgCode());
 		checksalary.setOrgcode(userBean.getOrgCode());
 		List<CalculationDto> jswsj = xcglassoxzbmapper.CalculationResults(checksalary);
 		List<CalculationDto> jswsj = xcglassoxzbmapper.CalculationResults(checksalary);
 		salfie.setComuser(jswsj);
 		salfie.setComuser(jswsj);