|
@@ -41,7 +41,7 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
|
|
|
private EdosUtil goldenUtil;
|
|
|
|
|
|
@Override
|
|
|
- public IPage<Windpowerstation> getList(String id, String name, String code, String companyid, String pageNum, String pageSize) {
|
|
|
+ public IPage<Windpowerstation> getList(String id, String name, String code, String companyid, String regionid,String pageNum, String pageSize) {
|
|
|
|
|
|
QueryWrapper<Windpowerstation> qw = new QueryWrapper<>();
|
|
|
|
|
@@ -58,9 +58,12 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
|
|
|
}
|
|
|
|
|
|
if (StringUtils.isNotEmpty(companyid)){
|
|
|
- qw.like("companyid",companyid);
|
|
|
+ qw.eq("companyid",companyid);
|
|
|
}
|
|
|
|
|
|
+ if (StringUtils.isNotEmpty(regionid)){
|
|
|
+ qw.eq("regionid",regionid);
|
|
|
+ }
|
|
|
Page<Windpowerstation> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
|
|
|
IPage<Windpowerstation> companysPage = getBaseMapper().selectPage(page, qw);
|
|
|
// List<Windpowerstation> list = companysPage.getRecords();
|