Merge branch 'dev' into docker_package

2022-07-06 17:58:36 +08:00 · 2022-07-06 17:58:36 +08:00 · ceb5c5fdea
parent eaaac41e48 ec7da281e6
commit ceb5c5fdea
1 changed files with 3 additions and 5 deletions
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@ -1326,11 +1326,9 @@
        WHERE 1=1
        AND del_flag = 0
        AND id in
-        <if>
-            <foreach item="resourceId" collection="list" open="(" separator="," close=")">
-                #{resourceId}
-            </foreach>
-        </if>
+        <foreach item="resourceId" collection="list" open="(" separator="," close=")">
+            #{resourceId}
+        </foreach>
        GROUP BY type
        ORDER BY type
    </select>