修改管材资源列表查询接口

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/MaterialController.java

@@ -23,6 +23,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -151,10 +152,15 @@ public class MaterialController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping( value = "/pageOutList")
 	@ApiOperation(httpMethod = "GET",value = "材料信息表分页查询",  notes = "材料信息表分页查询")
-	public ResponseModel<IPage<MaterialDto>> queryPage( int current, int size, MaterialDto material) {
+	public ResponseModel<IPage<MaterialDto>> queryPage(@RequestParam(required=false) Integer current,@RequestParam(required=false) Integer size, MaterialDto material) {
 		IPage<Material> page = new Page<>();
-		page.setCurrent(current);
-		page.setSize(size);
+		if(ValidationUtil.isEmpty(current) && ValidationUtil.isEmpty(size)){
+			page.setCurrent(1);
+			page.setSize(Long.MAX_VALUE);
+		} else{
+			page.setCurrent(current);
+			page.setSize(size);
+		}
 		return ResponseHelper.buildResponse(materialServiceImpl.queryOutPage(page,material));
 	}