3 커밋 7f77dc57a9 ... 881d75c2ad

작성자 SHA1 메시지 날짜
  ZeroLiYi 881d75c2ad Merge branch 'dev' of http://101.36.160.140:21044/province-qinghai/province-all into dev 1 개월 전
  ZeroLiYi 8d284f3de0 Merge remote-tracking branch 'remotes/origin/dev-2.9.1' into dev 1 개월 전
  ZeroLiYi bfe7fcdaa2 统计bug 1 개월 전

+ 3 - 1
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,
195 195
             esNetworkEntryCountVOList.addAll(esNetworkEntryMapper.selectCountyCount(esNetworkEntryCountParam));
196 196
             esNetworkEntryCountVOList.addAll(esNetworkEntryMapper.selectEnterpriseCount(esNetworkEntryCountParam));
197 197
 
198
-        }else{
198
+        }
199
+        if(StringUtils.isBlank(esNetworkEntryCountParam.getManagementAreaCounty())&&StringUtils.isBlank(esNetworkEntryCountParam.getManagementAreaCity())){
200
+
199 201
 
200 202
             esNetworkEntryCountVOList.addAll(esNetworkEntryMapper.selectProvinceCount(esNetworkEntryCountParam));
201 203
             esNetworkEntryCountVOList.addAll(esNetworkEntryMapper.selectCityCount(esNetworkEntryCountParam));