From 6776fecfe943b27fe28eba143f949e6b35af67e4 Mon Sep 17 00:00:00 2001
From: wsw <wsw@winning.com.cn>
Date: Mon, 3 Jun 2024 09:55:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E4=BB=B6=E5=88=97=E8=A1=A8=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 playedu-course/src/main/resources/mapper/CourseMapper.xml  | 6 ------
 .../src/main/resources/mapper/ResourceMapper.xml           | 7 ++++---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/playedu-course/src/main/resources/mapper/CourseMapper.xml b/playedu-course/src/main/resources/mapper/CourseMapper.xml
index ebf4fcc..5cf801e 100644
--- a/playedu-course/src/main/resources/mapper/CourseMapper.xml
+++ b/playedu-course/src/main/resources/mapper/CourseMapper.xml
@@ -96,9 +96,6 @@
                 <when test="sortField == 'created_at'">
                     ORDER BY `courses`.`created_at` ASC
                 </when>
-                <when test="sortField == 'sort_at'">
-                    ORDER BY `courses`.`sort_at` ASC
-                </when>
                 <otherwise>
                     ORDER BY `courses`.`id` ASC
                 </otherwise>
@@ -115,9 +112,6 @@
                 <when test="sortField == 'created_at'">
                     ORDER BY `courses`.`created_at` DESC
                 </when>
-                <when test="sortField == 'sort_at'">
-                    ORDER BY `courses`.`sort_at` DESC
-                </when>
                 <otherwise>
                     ORDER BY `courses`.`id` DESC
                 </otherwise>
diff --git a/playedu-resource/src/main/resources/mapper/ResourceMapper.xml b/playedu-resource/src/main/resources/mapper/ResourceMapper.xml
index bb3e4b2..6228dc7 100644
--- a/playedu-resource/src/main/resources/mapper/ResourceMapper.xml
+++ b/playedu-resource/src/main/resources/mapper/ResourceMapper.xml
@@ -146,9 +146,9 @@
         SELECT DISTINCT ( `resources`.`type` )
         FROM `resources`
         <choose>
-            <when test="categoryIds != null and categoryIds != ''">
+            <when test="categoryIds != null and !categoryIds.isEmpty()">
                 <choose>
-                    <when test="categoryIds.indexOf('0') == 0">
+                    <when test="categoryIds.get(0) == 0">
                         LEFT JOIN `resource_category` ON `resource_category`.`rid` = `resources`.`id`
                         WHERE `resources`.`is_hidden` = 0
                         AND `resource_category`.`cid` IS NULL
@@ -156,7 +156,8 @@
                     <otherwise>
                         INNER JOIN `resource_category` ON `resource_category`.`rid` = `resources`.`id`
                         WHERE `resources`.`is_hidden` = 0
-                        AND `resource_category`.`cid` IN (#{categoryIds})
+                        AND `resource_category`.`cid` IN (<foreach collection="categoryIds" item="tmpId" separator=",">
+                        #{tmpId}</foreach>)
                     </otherwise>
                 </choose>
             </when>