From 59fd3fb7d6bc41bfab82ee8032cebe7c47dc0de3 Mon Sep 17 00:00:00 2001
From: lizhicheng <lizhicheng2@hisense.com>
Date: Tue, 1 Nov 2022 09:36:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E4=BC=9A=E5=AE=A2=E5=8E=85=E3=80=81=E9=A6=96=E9=A1=B5=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resource/service/impl/ResourceServiceImpl.java     |  8 ++++++--
 .../src/main/resources/mapper/resource/ResourceDao.xml | 10 ++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
index bd3b1c61..32d78e97 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
@@ -1917,7 +1917,11 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
         CompletableFuture<Void> all = CompletableFuture.allOf(jcss, hkt, sphy);
         all.join();
 
-        return resultMap;
+        return new LinkedHashMap(){{
+            put("视频资源", resultMap.get("视频资源"));
+            put("会客厅", resultMap.get("会客厅"));
+            put("视频会议", resultMap.get("视频会议"));
+        }};
     }
 
     @Override
@@ -1931,7 +1935,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
     @Override
     public Object selectCollectResourceList() {
         List<Map> resourceCountList = baseDao.selectCollectResourceList();
-        Map result = new HashMap();
+        Map result = new LinkedHashMap();
         resourceCountList.stream().filter(it -> it.get("type") != null && !it.get("type").equals("")).forEach(it -> result.put(it.get("type"), it.get("count")));
         return result;
     }
diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
index 2d2207bc..b816ab95 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -1797,7 +1797,7 @@
         GROUP BY
         sd.id,
         tdr.type
-        <if test="type == null or type == '' or type == '会议室'">
+        <if test="type == null or type == '' or type == '会客厅'">
             UNION
 
             SELECT
@@ -1986,14 +1986,14 @@
             AND SUBSTR(taa.create_date, 1, 10) BETWEEN #{startDate} AND #{endDate}
         </if>
 
-        <if test="type == null or type == '' or type == '会议室'">
+        <if test="type == null or type == '' or type == '会客厅'">
             UNION ALL
 
             SELECT
             tmb.dept AS 'deptName',
             tm.`name` AS 'resourceName',
             '青岛市大数据发展管理局' AS 'resourceDeptName',
-            '会议室' AS 'type',
+            '会客厅' AS 'type',
             tmb.create_date AS 'createDate',
             CASE tmb.state WHEN 1 THEN '审核中' WHEN 2 THEN '通过' WHEN 3 THEN '不通过' ELSE '审核中' END AS
             'approveStatus',
@@ -2040,9 +2040,11 @@
         FROM tb_data_attr a INNER JOIN mysql.help_topic b ON a.attr_type='应用领域' AND a.del_flag=0 AND b.help_topic_id
         <![CDATA[ < ]]> (length(a.attr_value) - length(REPLACE(a.attr_value, ';', '')) + 1)) tda
         ON tdr.id=tda.data_resource_id
+        LEFT JOIN (select sdd.sort, sdd.dict_label from sys_dict_data sdd left join tb_data_category tdc on sdd.dict_type_id=tdc.link_value
+        where 1=1 and sdd.status=1 and tdc.del_flag=0 and tdc.name='应用领域' and tdc.root_category='应用资源') dict ON dict.dict_label=tda.attr_value
         WHERE 1=1 AND tdr.del_flag=0 AND tdr.type='应用资源'
         GROUP BY tda.attr_value
-        ORDER BY count DESC
+        ORDER BY ANY_VALUE(IFNULL(dict.sort, 9999)) ASC
     </select>
 
     <select id="getPraiseList" resultType="java.util.Map">