Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/YJDPStatisticsServiceImpl.java

@@ -634,7 +634,7 @@ public class YJDPStatisticsServiceImpl {
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.query(boolMust);
         request.source(builder);
-        List<JSONObject> list;
+        List<JSONObject> list = null;
         Set<String> useUnitCreditCodeSet = Sets.newHashSet();
         try {
             SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
@@ -643,7 +643,9 @@ public class YJDPStatisticsServiceImpl {
                 JSONObject source = jsonObject.getJSONObject("sourceAsMap");
                 useUnitCreditCodeSet.add(source.getString("USE_UNIT_CREDIT_CODE"));
             }
-            list = alertStatisticsMapper.getUseUnitByCreditCode(useUnitCreditCodeSet);
+            if (!ValidationUtil.isEmpty(useUnitCreditCodeSet)) {
+                list = alertStatisticsMapper.getUseUnitByCreditCode(useUnitCreditCodeSet);
+            }
         } catch (IOException e) {
             throw new RuntimeException(e);
         }