From d599c2d1c2a649237137ccd54bbac433f6bdd103 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 19 Dec 2024 14:37:40 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=B7=A5=E5=8D=95?=
=?UTF-8?q?=E5=A4=84=E7=90=86-=E9=80=9A=E8=BF=87=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B7=A5=E5=8D=95=E5=BC=95=E7=94=A8=E7=9A=84?=
=?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E5=B7=A5=E5=8D=95=E8=8A=82=E7=82=B9?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E5=9B=9E=E9=80=80=E7=BA=BF=EF=BC=8C?=
=?UTF-8?q?=E4=BD=86=E6=98=AF=E6=B2=A1=E6=9C=89=E5=9B=9E=E9=80=80=E6=93=8D?=
=?UTF-8?q?=E4=BD=9C=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
关联 #[1314566103859200]工单处理-通过接口更新工单引用的流程，工单节点更新了回退线，但是没有回退操作按钮 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1314566103859200
---
.../resource/ResourceCenterResourceServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/neatlogic/module/cmdb/service/resourcecenter/resource/ResourceCenterResourceServiceImpl.java b/src/main/java/neatlogic/module/cmdb/service/resourcecenter/resource/ResourceCenterResourceServiceImpl.java
index 3c3199de..9d385714 100644
--- a/src/main/java/neatlogic/module/cmdb/service/resourcecenter/resource/ResourceCenterResourceServiceImpl.java
+++ b/src/main/java/neatlogic/module/cmdb/service/resourcecenter/resource/ResourceCenterResourceServiceImpl.java
@@ -776,7 +776,7 @@ public class ResourceCenterResourceServiceImpl implements IResourceCenterResourc
schemaMapper.deleteTable(TenantContext.get().getDataDbName() + "." + viewName);
}
String sql = "CREATE OR REPLACE VIEW " + TenantContext.get().getDataDbName() + "." + viewName + " AS " + selectSql;
- schemaMapper.insertView(sql);
+// schemaMapper.insertView(sql);
}).execute();
if (s.isSucceed()) {
DataBaseViewInfoVo dataBaseViewInfoVo = new DataBaseViewInfoVo();
--
Gitee
From fa85e278db7c387a31594cc45a40cb88f5b6c8de Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 20 Dec 2024 15:33:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=A1=A8=E5=8D=95?=
=?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E7=BB=84=E4=BB=B6=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E6=BA=90=E4=B8=BA=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A7=86=E5=9B=BE?=
=?UTF-8?q?=E7=9F=A9=E9=98=B5=E6=97=B6=E5=85=B3=E8=81=94=E8=AE=BE=E7=BD=AE?=
=?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E4=B8=AD=E2=80=9C=E7=AD=89?=
=?UTF-8?q?=E4=BA=8E=E2=80=9D=E8=A1=A8=E8=BE=BE=E5=BC=8F=E8=A6=81=E6=94=AF?=
=?UTF-8?q?=E6=8C=81=E5=A4=9A=E4=B8=AA=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
关联 #[1315934889803776]表单下拉框组件数据源为自定义视图矩阵时关联设置过滤条件中“等于”表达式要支持多个值 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1315934889803776
---
.../dao/mapper/customview/CustomViewDataMapper.xml | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/customview/CustomViewDataMapper.xml b/src/main/java/neatlogic/module/cmdb/dao/mapper/customview/CustomViewDataMapper.xml
index 876e1e05..19a1bfff 100644
--- a/src/main/java/neatlogic/module/cmdb/dao/mapper/customview/CustomViewDataMapper.xml
+++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/customview/CustomViewDataMapper.xml
@@ -107,10 +107,16 @@ along with this program. If not, see .-->
- `${attrFilter.attrUuid}_hash` = #{attrFilter.value,typeHandler=Md5Handler}
+ `${attrFilter.attrUuid}_hash` IN
+
+ #{valueString,typeHandler=Md5Handler}
+
- `${attrFilter.attrUuid}` = #{attrFilter.value}
+ `${attrFilter.attrUuid}` IN
+
+ #{valueString}
+
--
Gitee
From 5326391557048b73509b259d7906c23791eeaadb Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 20 Dec 2024 15:35:36 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=A1=A8=E5=8D=95?=
=?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E7=BB=84=E4=BB=B6=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E6=BA=90=E4=B8=BA=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A7=86=E5=9B=BE?=
=?UTF-8?q?=E7=9F=A9=E9=98=B5=E6=97=B6=E5=85=B3=E8=81=94=E8=AE=BE=E7=BD=AE?=
=?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E4=B8=AD=E2=80=9C=E7=AD=89?=
=?UTF-8?q?=E4=BA=8E=E2=80=9D=E8=A1=A8=E8=BE=BE=E5=BC=8F=E8=A6=81=E6=94=AF?=
=?UTF-8?q?=E6=8C=81=E5=A4=9A=E4=B8=AA=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
关联 #[1315934889803776]表单下拉框组件数据源为自定义视图矩阵时关联设置过滤条件中“等于”表达式要支持多个值 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1315934889803776
---
.../resource/ResourceCenterResourceServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/neatlogic/module/cmdb/service/resourcecenter/resource/ResourceCenterResourceServiceImpl.java b/src/main/java/neatlogic/module/cmdb/service/resourcecenter/resource/ResourceCenterResourceServiceImpl.java
index 9d385714..3c3199de 100644
--- a/src/main/java/neatlogic/module/cmdb/service/resourcecenter/resource/ResourceCenterResourceServiceImpl.java
+++ b/src/main/java/neatlogic/module/cmdb/service/resourcecenter/resource/ResourceCenterResourceServiceImpl.java
@@ -776,7 +776,7 @@ public class ResourceCenterResourceServiceImpl implements IResourceCenterResourc
schemaMapper.deleteTable(TenantContext.get().getDataDbName() + "." + viewName);
}
String sql = "CREATE OR REPLACE VIEW " + TenantContext.get().getDataDbName() + "." + viewName + " AS " + selectSql;
-// schemaMapper.insertView(sql);
+ schemaMapper.insertView(sql);
}).execute();
if (s.isSucceed()) {
DataBaseViewInfoVo dataBaseViewInfoVo = new DataBaseViewInfoVo();
--
Gitee