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 f90198d0dcb9e9f0b5f84b727f49247a61eb06f5..c73acacc4b1705d8fa1343725f83b9b9aa1ae187 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 0b6fc9d0bc74fcb9a3b857358eee8ddbe29fc2e1..f40c135e11100f057aee2ea22c1ec2ffda7443c3 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 f6df8f8341f158c185f3305473d687fd30432bd1..96b6049663892261bd157257b7c66d8d7d0cdddc 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 resultList = RebuildDataBaseViewManager.execute(); return TableResultUtil.getResult(resultList); }