新建门店状态策略属性条件排序-代码优化

gic-store-web/src/main/java/com/gic/store/web/controller/StoreStrategyController.java

@@ -59,9 +59,7 @@ public class StoreStrategyController {
         }
         //有序
         Map<String, String> result = new LinkedHashMap<>(16);
-        for (StrategyStoreFieldEnum fieldEnum : StrategyStoreFieldEnum.values()) {
-            result.put(fieldEnum.getCode(), fieldEnum.getMessage());
-        }
+
         //单选或者多选的，也需要
         ServiceResponse<List<StoreFieldDTO>> storeFieldDTOServiceResponse = storeFieldApiService
                 .listStoreFieldByRegionId(regionId);
@@ -74,6 +72,9 @@ public class StoreStrategyController {
                             || e.getStoreFieldType().intValue() == StoreFieldTypeEnum.CHECK.getCode())
                     .forEach(e -> result.put(e.getStoreFieldId().toString(), e.getStoreFieldName()));
         }
+        for (StrategyStoreFieldEnum fieldEnum : StrategyStoreFieldEnum.values()) {
+            result.put(fieldEnum.getCode(), fieldEnum.getMessage());
+        }
         return RestResponse.success(result);
     }