[Fix-apache#6854][dao] fix "ResourceMapper.xml -> queryResourcePaging…

…" sql bug (apache#6907) * fix complement data retry bug; issues: [Bug] [Master] A bug on task retry mechanism apache#6613 * [DS-apache#5293][chore]upgrade cron-utils version 5.0.5 -> 9.1.3 * [DS-apache#5293]update the licensing information of that dependency * [DS-apache#5293]update the licensing information of that dependency * update the licensing information of that dependency * [DS-apache#5293]update the licensing information of that dependency * [DS-apache#6854][fix] fix "ResourceMapper.xml -> queryResourcePaging" sql bug * [DS-apache#6854][fix] fix "ResourceMapper.xml -> queryResourcePaging" sql bug Co-authored-by: yangqiyu <[email protected]>
Lucaszlei · Dec 26, 2021 · 8aab15a · 8aab15a
1 parent e1d0df1
commit 8aab15a
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/...cheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml b/...cheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
@@ -62,13 +62,14 @@
         where d.type=#{type} and d.pid=#{id}
         <if test="userId != 0">
             and (
-            <if test="resIds != null and resIds.size() > 0">
-                d.id in
-                <foreach collection="resIds" item="i" open="(" close=") or" separator=",">
-                    #{i}
-                </foreach>
-            </if>
-            d.user_id=#{userId} )
+                    d.user_id=#{userId}
+                    <if test="resIds != null and resIds.size() > 0">
+                        or d.id in
+                        <foreach collection="resIds" item="i" open="(" close=")" separator=",">
+                            #{i}
+                        </foreach>
+                    </if>
+                )
         </if>
         <if test="searchVal != null and searchVal != ''">
             and d.alias like concat('%', #{searchVal}, '%')