| 
														
															@@ -62,13 +62,11 @@ public class SyCapacityControlController extends JeecgController<SyCapacityContr 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 	//@AutoLog(value = "产能控制-分页列表查询") 
														 | 
														
														 | 
														
															 	//@AutoLog(value = "产能控制-分页列表查询") 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 	@ApiOperation(value="产能控制-分页列表查询", notes="产能控制-分页列表查询") 
														 | 
														
														 | 
														
															 	@ApiOperation(value="产能控制-分页列表查询", notes="产能控制-分页列表查询") 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 	@GetMapping(value = "/list") 
														 | 
														
														 | 
														
															 	@GetMapping(value = "/list") 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-	public Result<IPage<SyCapacityControl>> queryPageList(SyCapacityControl syCapacityControl, 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+	public Result<List<SyCapacityControl>> queryPageList(String supplier, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, 
														 | 
														
														 | 
														
															 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, 
														 | 
														
														 | 
														
															 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 								   HttpServletRequest req) { 
														 | 
														
														 | 
														
															 								   HttpServletRequest req) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-		QueryWrapper<SyCapacityControl> queryWrapper = QueryGenerator.initQueryWrapper(syCapacityControl, req.getParameterMap()); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-		Page<SyCapacityControl> page = new Page<SyCapacityControl>(pageNo, pageSize); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-		IPage<SyCapacityControl> pageList = syCapacityControlService.page(page, queryWrapper); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+		List<SyCapacityControl> pageList = syCapacityControlService.query(supplier,pageNo,pageSize); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		return Result.OK(pageList); 
														 | 
														
														 | 
														
															 		return Result.OK(pageList); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 	} 
														 | 
														
														 | 
														
															 	} 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 	 
														 | 
														
														 | 
														
															 	 
														 |