|
@@ -138,9 +138,10 @@ public class WindpowerstationController {
|
|
@RequestParam(value = "name",required = false) String name,
|
|
@RequestParam(value = "name",required = false) String name,
|
|
@RequestParam(value = "code",required = false) String code,
|
|
@RequestParam(value = "code",required = false) String code,
|
|
@RequestParam(value = "companyid",required = false) String companyid,
|
|
@RequestParam(value = "companyid",required = false) String companyid,
|
|
|
|
+ @RequestParam(value = "regionid",required = false) String regionid,
|
|
@RequestParam(value = "pageNum",required = true) String pageNum,
|
|
@RequestParam(value = "pageNum",required = true) String pageNum,
|
|
@RequestParam(value = "pageSize",required = true) String pageSize){
|
|
@RequestParam(value = "pageSize",required = true) String pageSize){
|
|
- IPage<Windpowerstation> list = windpowerstationService.getList(id,name,code,companyid,pageNum,pageSize);
|
|
|
|
|
|
+ IPage<Windpowerstation> list = windpowerstationService.getList(id,name,code,companyid,regionid,pageNum,pageSize);
|
|
if (null != list){
|
|
if (null != list){
|
|
return R.ok().data(list);
|
|
return R.ok().data(list);
|
|
}else {
|
|
}else {
|