diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java index 99c71b8..72ee28a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java @@ -327,7 +327,7 @@ public class WaterServiceImpl implements IWaterService { */ private List getModelStationList() { // 水利站点(All) - List stationList = stationService.getStationType(HomePageConstant.HYDROPOWER_SERVETYPE, null, null,false); + List stationList = stationService.getStationType(HomePageConstant.HYDROPOWER_SERVETYPE, null, null,true); if(CollectionUtil.isEmpty(stationList)){ return null; } @@ -827,7 +827,7 @@ public class WaterServiceImpl implements IWaterService { @Override public WaterConservancyVo waterConservancy(Long deptId) { // 查询水利站点 - List stations = stationService.getHomeStationList(deptId, HomePageConstant.waterList, HomePageConstant.HYDROPOWER_SERVETYPE,false); + List stations = stationService.getHomeStationList(deptId, HomePageConstant.waterList, HomePageConstant.HYDROPOWER_SERVETYPE,true); if (CollectionUtil.isEmpty(stations)) { return new WaterConservancyVo(); } @@ -888,7 +888,7 @@ public class WaterServiceImpl implements IWaterService { public List waterDetails(Long deptId) { // 获取区域map : key-区域机构 value-水利站点集合 // 获取区域或者站点map结构 - Map> map = areaService.areaOrStaion(deptId,HomePageConstant.waterList,false); + Map> map = areaService.areaOrStaion(deptId,HomePageConstant.waterList,true); if(MapUtils.isEmpty(map)){ return null; } @@ -933,7 +933,7 @@ public class WaterServiceImpl implements IWaterService { @Override public List waterUseEleRanking(Long deptId) { // 获取区域map : key-区域机构 value-水利站点集合 - Map> map = areaService.areaOrStaion(deptId,HomePageConstant.waterList,false); + Map> map = areaService.areaOrStaion(deptId,HomePageConstant.waterList,true); if(MapUtils.isEmpty(map)){ return null; } @@ -1002,7 +1002,7 @@ public class WaterServiceImpl implements IWaterService { return null; } // 获取水利站点 - List stationList = stationService.getStationList(R.getData(),deptId,HomePageConstant.waterList,HomePageConstant.HYDROPOWER_SERVETYPE,false); + List stationList = stationService.getStationList(R.getData(),deptId,HomePageConstant.waterList,HomePageConstant.HYDROPOWER_SERVETYPE,true); if(CollectionUtil.isEmpty(stationList)){ return null; } @@ -1062,7 +1062,7 @@ public class WaterServiceImpl implements IWaterService { return null; } // 获取水利站点 - List stationList = stationService.getStationList(R.getData(),deptId,HomePageConstant.waterList,HomePageConstant.HYDROPOWER_SERVETYPE,false); + List stationList = stationService.getStationList(R.getData(),deptId,HomePageConstant.waterList,HomePageConstant.HYDROPOWER_SERVETYPE,true); if(CollectionUtil.isEmpty(stationList)){ return null; } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/ImsDeptServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/ImsDeptServiceImpl.java index 630b930..5e615dc 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/ImsDeptServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/ImsDeptServiceImpl.java @@ -208,7 +208,7 @@ public class ImsDeptServiceImpl extends ServiceImpl stationEntityList = stationService.getStationType(serveType, type ,value,false); + List stationEntityList = stationService.getStationType(serveType, type ,value,true); if(CollectionUtil.isEmpty(stationEntityList)){ return null; }