From b1a19a2d971861b228366ae2dcafef9eaebd1de6 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Fri, 15 Dec 2023 19:04:36 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-C?=
 =?UTF-8?q?MDB-=E6=A8=A1=E5=9E=8B=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E3=80=81=E9=85=8D=E7=BD=AE=E9=A1=B9=E6=9F=A5=E8=AF=A2=E7=9A=84?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=91=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1047056406249472]后端-CMDB-模型详情页面、配置项查询的详情页面，增加树目录 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1047056406249472
---
 src/main/java/neatlogic/module/cmdb/api/ci/SaveCiApi.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/neatlogic/module/cmdb/api/ci/SaveCiApi.java b/src/main/java/neatlogic/module/cmdb/api/ci/SaveCiApi.java
index 8b3b168a..01b6ca31 100644
--- a/src/main/java/neatlogic/module/cmdb/api/ci/SaveCiApi.java
+++ b/src/main/java/neatlogic/module/cmdb/api/ci/SaveCiApi.java
@@ -74,7 +74,7 @@ public class SaveCiApi extends PrivateApiComponentBase {
             @Param(name = "description", type = ApiParamType.STRING, desc = "common.memo", maxLength = 500, xss = true),
             @Param(name = "icon", type = ApiParamType.STRING, isRequired = true, desc = "common.icon"),
             @Param(name = "typeId", type = ApiParamType.LONG, desc = "common.typeid", isRequired = true),
-            @Param(name = "catalogId", type = ApiParamType.LONG, desc = "common.catalogid", isRequired = true),
+            @Param(name = "catalogId", type = ApiParamType.LONG, desc = "common.catalogid"),
             @Param(name = "parentCiId", type = ApiParamType.LONG, desc = "term.cmdb.parentcientityid"),
             @Param(name = "fileId", type = ApiParamType.LONG, desc = "term.cmdb.virtualcifileid"),
             @Param(name = "expiredDay", type = ApiParamType.INTEGER, desc = "common.expireddays"),
-- 
Gitee


From 9a459b5e6a15a66ba03ec5d79f2d0a9ae7bf1db9 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Sat, 16 Dec 2023 11:32:43 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-C?=
 =?UTF-8?q?MDB-=E6=A8=A1=E5=9E=8B=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E3=80=81=E9=85=8D=E7=BD=AE=E9=A1=B9=E6=9F=A5=E8=AF=A2=E7=9A=84?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=91=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1047056406249472]后端-CMDB-模型详情页面、配置项查询的详情页面，增加树目录 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1047056406249472
---
 .../module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml
index bc7c12a9..e4052f33 100644
--- a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml
+++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml
@@ -1515,7 +1515,7 @@ limitations under the License.
                         `app_system_id` AS appSystemId
         FROM @{DATA_SCHEMA}.`scence_appmodule_appsystem`
         WHERE `app_system_id` = #{value}
-        ORDER BY CONVERT (`abbr_name` USING gbk) COLLATE gbk_chinese_ci ASC
+        <!-- ORDER BY CONVERT (`abbr_name` USING gbk) COLLATE gbk_chinese_ci ASC -->
     </select>
 
     <select id="getAppSystemCountByKeyword" parameterType="neatlogic.framework.common.dto.BasePageVo" resultType="int">
-- 
Gitee


From 1ed495ce95d067b5dd25559766422cfa78ff8f9c Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Sat, 16 Dec 2023 12:30:06 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-C?=
 =?UTF-8?q?MDB-=E6=A8=A1=E5=9E=8B=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E3=80=81=E9=85=8D=E7=BD=AE=E9=A1=B9=E6=9F=A5=E8=AF=A2=E7=9A=84?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=91=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1047056406249472]后端-CMDB-模型详情页面、配置项查询的详情页面，增加树目录 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1047056406249472
---
 .../config/getResourceEntityViewDataListApi.java   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/neatlogic/module/cmdb/api/resourcecenter/config/getResourceEntityViewDataListApi.java b/src/main/java/neatlogic/module/cmdb/api/resourcecenter/config/getResourceEntityViewDataListApi.java
index 1417aa3b..fe95451d 100644
--- a/src/main/java/neatlogic/module/cmdb/api/resourcecenter/config/getResourceEntityViewDataListApi.java
+++ b/src/main/java/neatlogic/module/cmdb/api/resourcecenter/config/getResourceEntityViewDataListApi.java
@@ -13,6 +13,7 @@ import neatlogic.framework.restful.constvalue.OperationTypeEnum;
 import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase;
 import neatlogic.framework.util.TableResultUtil;
 import neatlogic.module.cmdb.dao.mapper.resourcecenter.ResourceEntityMapper;
+import neatlogic.module.cmdb.utils.ResourceEntityFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -47,13 +48,16 @@ public class getResourceEntityViewDataListApi extends PrivateApiComponentBase {
     @Override
     public Object myDoService(JSONObject paramObj) throws Exception {
         String name = paramObj.getString("name");
+        List<String> fieldNameList = ResourceEntityFactory.getFieldNameListByViewName(name);
         JSONArray theadList = new JSONArray();
         List<String> columnNameList = schemaMapper.getTableOrViewAllColumnNameList(TenantContext.get().getDataDbName(), name);
-        for (String columnName : columnNameList) {
-            JSONObject thead = new JSONObject();
-            thead.put("key", columnName);
-            thead.put("title", columnName);
-            theadList.add(thead);
+        for (String fieldName : fieldNameList) {
+            if (columnNameList.contains(fieldName)) {
+                JSONObject thead = new JSONObject();
+                thead.put("key", fieldName);
+                thead.put("title", fieldName);
+                theadList.add(thead);
+            }
         }
         BasePageVo basePageVo = paramObj.toJavaObject(BasePageVo.class);
         int rowNum = resourceEntityMapper.getResourceEntityViewDataCount(name);
-- 
Gitee