门店查询支持多个门店控件id聚合

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java

@@ -533,7 +533,7 @@ public class StoreApiServiceImpl implements StoreApiService {
             sortJson = QueryConditionAssemblyUtil.createSortNode(StoreESFieldsEnum.UPDATETIME.getField(), QueryConditionAssemblyUtil.SORT_RULE_DESC);
         }
         ServiceResponse<ESResponseQueryBatchDTO> response = this.queryStoreFromES(enterpriseJson, pageNum, pageSize, sortJson, returnFileds);
-        if (response.isSuccess()) {
+        if (response.isSuccess() && response.getResult() != null) {
             Page<StoreDTO> page = new Page(pageNum, pageSize);
             page.setTotalCount(Integer.valueOf(response.getResult().getTotalNumber() + ""));
             List<JSONObject> list = response.getResult().getRes();
@@ -1471,9 +1471,11 @@ public class StoreApiServiceImpl implements StoreApiService {
     private JSONObject buildSearchJSON(StoreSearchDTO storeSearchDTO){
         logger.info("查询条件：{}", JSON.toJSONString(storeSearchDTO));
         List<JSONObject> jsonObjectList = new ArrayList<>();
-        JSONObject enterpriseJson = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.ENTERPRISEID.getField(), OperateEnum.OPERATE_EQ, storeSearchDTO.getEnterpriseId());
-        jsonObjectList.add(enterpriseJson);
         JSONObject json = null;
+        if(storeSearchDTO.getEnterpriseId() != null){
+            JSONObject enterpriseJson = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.ENTERPRISEID.getField(), OperateEnum.OPERATE_EQ, storeSearchDTO.getEnterpriseId());
+            jsonObjectList.add(enterpriseJson);
+        }
         if (storeSearchDTO.getStoreGroupId() != null) {
             json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STOREGROUPIDLIST.getField(), OperateEnum.OPERATE_ARR_CONTAIN, storeSearchDTO.getStoreGroupId());
             jsonObjectList.add(json);