门店查询修改

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

@@ -796,16 +796,15 @@ public class StoreApiServiceImpl implements StoreApiService {
     public ServiceResponse queryStoreFromEs(JSONObject jsonObject, Integer pageNum, Integer pageSize, JSONObject sortJson, String returnFileds) {
         if (StringUtils.isBlank(returnFileds)) {
             returnFileds = StoreESFieldsEnum.STOREID.getField();
-        } else {
-            if (returnFileds.contains(StoreESFieldsEnum.OWNTYPE.getField())) {
-                returnFileds += "," + StoreESFieldsEnum.OWNTYPE.getField();
-            }
-            if (returnFileds.contains(StoreESFieldsEnum.FROM_ENTERPRISE_ID.getField())) {
-                returnFileds += "," + StoreESFieldsEnum.FROM_ENTERPRISE_ID.getField();
-            }
-            if (returnFileds.contains(StoreESFieldsEnum.FROM_ENTERPRISE_NAME.getField())) {
-                returnFileds += "," + StoreESFieldsEnum.FROM_ENTERPRISE_NAME.getField();
-            }
+        }
+        if (!returnFileds.contains(StoreESFieldsEnum.OWNTYPE.getField())) {
+            returnFileds += "," + StoreESFieldsEnum.OWNTYPE.getField();
+        }
+        if (!returnFileds.contains(StoreESFieldsEnum.FROM_ENTERPRISE_ID.getField())) {
+            returnFileds += "," + StoreESFieldsEnum.FROM_ENTERPRISE_ID.getField();
+        }
+        if (!returnFileds.contains(StoreESFieldsEnum.FROM_ENTERPRISE_NAME.getField())) {
+            returnFileds += "," + StoreESFieldsEnum.FROM_ENTERPRISE_NAME.getField();
         }
         DynamicSearchDTO dynamicSearchDTO = new DynamicSearchDTO();
         dynamicSearchDTO.setSearchJson(jsonObject);