1.评估大屏标记点接口无区域标识时返回全部数据

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/StationBasicServiceImpl.java

@@ -20,6 +20,7 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieModel;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -284,7 +285,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio
         //图例数据列表
         List<Indicator> indicatorList = indicatorServiceImpl.getIndicatorByType(type);
         // 如果传递areaCode 或者areaCode值不为空
-        if (areaCode != null&&!areaCode.equals("")) {
+        if (StringUtils.isNotEmpty(areaCode)) {
             //查询区域信息
             MapRegion mapRegion = mapRegionServiceImpl.getOne(new QueryWrapper<MapRegion>().eq("name", areaCode));
             //如果区域信息不为空则继续查询省份
@@ -305,9 +306,8 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio
                     list = stationBasicMapper.getStationList(String.valueOf(region.getRegionCode()));
                 }
             }
-        }
-        //如果列表为空，则传值有问题返回所有
-        if (list.isEmpty()) {
+        } else {
+            // 全国
             list.addAll(stationBasicMapper.getStationList(null));
         }
         List<StationRecordInfo> stationRecordInfoList = list.stream().filter(stationRecordInfo -> !org.springframework.util.ObjectUtils.isEmpty(stationRecordInfo.getTitlePos())).collect(Collectors.toList());