Merge remote-tracking branch 'remotes/origin/dev-2.9.1' into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupport/modular/es/service/impl/EsNetworkEntryServiceImpl.java

@@ -195,7 +195,9 @@ public class EsNetworkEntryServiceImpl extends ServiceImpl<EsNetworkEntryMapper,
             esNetworkEntryCountVOList.addAll(esNetworkEntryMapper.selectCountyCount(esNetworkEntryCountParam));
             esNetworkEntryCountVOList.addAll(esNetworkEntryMapper.selectEnterpriseCount(esNetworkEntryCountParam));
 
-        }else{
+        }
+        if(StringUtils.isBlank(esNetworkEntryCountParam.getManagementAreaCounty())&&StringUtils.isBlank(esNetworkEntryCountParam.getManagementAreaCity())){
+
 
             esNetworkEntryCountVOList.addAll(esNetworkEntryMapper.selectProvinceCount(esNetworkEntryCountParam));
             esNetworkEntryCountVOList.addAll(esNetworkEntryMapper.selectCityCount(esNetworkEntryCountParam));