From 146b20ad848a217a049db2c5019a612bcb5985f1 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Tue, 11 Feb 2025 16:43:39 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E9=87=8D=E5=BB=BA?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E5=A4=B1=E8=B4=A5=E4=BA=86=E5=8D=B4=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1352076393676800]重建视图失败了却提示成功 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1352076393676800
---
 .../java/neatlogic/module/tenant/api/form/FormSaveApi.java | 1 +
 .../api/matrix/MatrixColumnDataSearchForSelectApi.java     | 7 +++++++
 .../module/tenant/api/util/RebuildDataBaseViewApi.java     | 7 +++++++
 3 files changed, 15 insertions(+)

diff --git a/src/main/java/neatlogic/module/tenant/api/form/FormSaveApi.java b/src/main/java/neatlogic/module/tenant/api/form/FormSaveApi.java
index f90198d0..c73acacc 100644
--- a/src/main/java/neatlogic/module/tenant/api/form/FormSaveApi.java
+++ b/src/main/java/neatlogic/module/tenant/api/form/FormSaveApi.java
@@ -201,6 +201,7 @@ public class FormSaveApi extends PrivateApiComponentBase {
                         IFormAttributeHandler formAttributeHandler = FormAttributeHandlerFactory.getHandler(formAttributeVo.getHandler());
                         if (formAttributeHandler != null) {
                             formAttributeHandler.validateExtendAttributeConfig(formAttributeVo.getKey(), formAttributeVo.getConfig());
+                            formAttributeVo.setConfigStr(null);
                         }
                         formMapper.insertFormExtendAttribute(formAttributeVo);
                     }
diff --git a/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForSelectApi.java b/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForSelectApi.java
index 0b6fc9d0..f40c135e 100644
--- a/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForSelectApi.java
+++ b/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForSelectApi.java
@@ -300,6 +300,13 @@ public class MatrixColumnDataSearchForSelectApi extends PrivateApiComponentBase
                             null
                     );
                     defaultValueFilterList.add(matrixDefaultValueFilterVo);
+                } else {
+                    String defaultValueStr = defaultValueObject.toString();
+                    MatrixDefaultValueFilterVo matrixDefaultValueFilterVo = new MatrixDefaultValueFilterVo(
+                            new MatrixKeywordFilterVo(valueField, SearchExpression.EQ.getExpression(), defaultValueStr),
+                            null
+                    );
+                    defaultValueFilterList.add(matrixDefaultValueFilterVo);
                 }
             }
             dataVo.setDefaultValueFilterList(defaultValueFilterList);
diff --git a/src/main/java/neatlogic/module/tenant/api/util/RebuildDataBaseViewApi.java b/src/main/java/neatlogic/module/tenant/api/util/RebuildDataBaseViewApi.java
index f6df8f83..96b60496 100644
--- a/src/main/java/neatlogic/module/tenant/api/util/RebuildDataBaseViewApi.java
+++ b/src/main/java/neatlogic/module/tenant/api/util/RebuildDataBaseViewApi.java
@@ -18,6 +18,7 @@ package neatlogic.module.tenant.api.util;
 import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.auth.core.AuthAction;
 import neatlogic.framework.auth.label.ADMIN;
+import neatlogic.framework.dao.mapper.DataBaseViewInfoMapper;
 import neatlogic.framework.rebuilddatabaseview.core.RebuildDataBaseViewManager;
 import neatlogic.framework.rebuilddatabaseview.core.ViewStatusInfo;
 import neatlogic.framework.restful.annotation.*;
@@ -27,6 +28,7 @@ import neatlogic.framework.util.TableResultUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 @Service
@@ -34,6 +36,10 @@ import java.util.List;
 @AuthAction(action = ADMIN.class)
 @OperationType(type = OperationTypeEnum.OPERATE)
 public class RebuildDataBaseViewApi extends PrivateApiComponentBase {
+
+    @Resource
+    private DataBaseViewInfoMapper dataBaseViewInfoMapper;
+
     @Override
     public String getName() {
         return "重建数据库视图";
@@ -51,6 +57,7 @@ public class RebuildDataBaseViewApi extends PrivateApiComponentBase {
     @Description(desc = "重建数据库视图")
     @Override
     public Object myDoService(JSONObject paramObj) throws Exception {
+        dataBaseViewInfoMapper.deleteDataBaseViewInfo();
         List<ViewStatusInfo> resultList = RebuildDataBaseViewManager.execute();
         return TableResultUtil.getResult(resultList);
     }
-- 
Gitee