From ef0cfacabe207182cca09547a775eeed8a3ecec5 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 22 一月 2026 15:10:44 +0800
Subject: [PATCH] #

---
 rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
index c2f1713..a1a564f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
@@ -9,6 +9,7 @@
 import com.vincent.rsf.framework.exception.CoolException;
 import com.vincent.rsf.server.common.domain.BaseParam;
 import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.enums.CommonStatus;
 import com.vincent.rsf.server.system.entity.Fields;
 import com.vincent.rsf.server.system.entity.FieldsItem;
 import com.vincent.rsf.server.system.service.FieldsItemService;
@@ -104,7 +105,7 @@
      * @time 2025/3/18 15:00
      */
     @Transactional(rollbackFor = Exception.class)
-    public static boolean saveFields(Map<String, ?> template, String uuid) throws Exception {
+    public static boolean saveFields(Map<String, ?> template, String uuid) {
         List<Fields> fields = getFieldsSta();
         FieldsItemService fieldsItemService = SpringUtils.getBean(FieldsItemService.class);
         List<FieldsItem> fieldsItems = new ArrayList<>();
@@ -137,7 +138,9 @@
      */
     public static List<Fields> getFieldsSta() {
         FieldsService fieldsService = SpringUtils.getBean(FieldsService.class);
-        return fieldsService.list(new LambdaQueryWrapper<Fields>().eq(Fields::getStatus, 1).eq(Fields::getFlagEnable, 1));
+        return fieldsService.list(new LambdaQueryWrapper<Fields>().eq(Fields::getStatus, CommonStatus.COMMONSTATUS_YES.val)
+//                .eq(Fields::getUnique, CommonStatus.COMMONSTATUS_YES.val)
+                .eq(Fields::getFlagEnable, CommonStatus.COMMONSTATUS_YES.val).orderByAsc(Fields::getId));
     }
 
     /**
@@ -182,7 +185,10 @@
                 }
             }
         } else {
-            saveFields(params, params.get("index").toString());
+            Object index = params.get("index");
+            if (!Cools.isEmpty(index)) {
+                saveFields(params, params.get("index").toString());
+            }
         }
     }
 

--
Gitblit v1.9.1