seg_yinzy
/
DolphinScheduler
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Fix-#6854][dao] fix "ResourceMapper.xml -> queryResourcePaging" sql bug (#6907) 

* fix complement data retry bug; issues: [Bug] [Master] A bug on task retry mechanism #6613

* [DS-#5293][chore]upgrade cron-utils version 5.0.5 -> 9.1.3

* [DS-#5293]update the licensing information of that dependency

* [DS-#5293]update the licensing information of that dependency

* update the licensing information of that dependency

* [DS-#5293]update the licensing information of that dependency

* [DS-#6854][fix] fix "ResourceMapper.xml -> queryResourcePaging" sql bug

* [DS-#6854][fix] fix "ResourceMapper.xml -> queryResourcePaging" sql bug

Co-authored-by: yangqiyu <yangqiyu@deepexi.com>
dailidong-patch-1
KyoYang 2021-12-15 19:18:00 +08:00 committed by GitHub
parent f36ca02907
commit 676a952bcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
View File

@ -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}, '%')