You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by he...@apache.org on 2022/06/17 08:33:42 UTC

[incubator-inlong] branch master updated: [INLONG-4671][Manager] Remove the approver filter condition when paging query inlong stream (#4686)

This is an automated email from the ASF dual-hosted git repository.

healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new cde204ab8 [INLONG-4671][Manager] Remove the approver filter condition when paging query inlong stream (#4686)
cde204ab8 is described below

commit cde204ab8763b4656a6d31a5a541836f550f127f
Author: healzhou <he...@gmail.com>
AuthorDate: Fri Jun 17 16:33:36 2022 +0800

    [INLONG-4671][Manager] Remove the approver filter condition when paging query inlong stream (#4686)
---
 .../src/main/resources/mappers/InlongStreamEntityMapper.xml           | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
index 52b17362e..ab54f4f11 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
@@ -258,10 +258,9 @@
         stream.data_separator, stream.data_escape_char, stream.sync_send, stream.daily_records,
         stream.daily_storage, stream.peak_records, stream.max_length, stream.storage_period,
         stream.status, stream.creator, stream.modifier, stream.create_time, stream.modify_time
-        from inlong_stream stream, inlong_group grp, workflow_approver approver
+        from inlong_stream stream, inlong_group grp
         <where>
             stream.is_deleted = 0
-            and approver.process_name = "NEW_GROUP_PROCESS" and approver.is_deleted = 0
             and stream.inlong_group_id = grp.inlong_group_id and grp.is_deleted = 0
             <if test="request.inlongGroupId != null and request.inlongGroupId != ''">
                 and stream.inlong_group_id = #{request.inlongGroupId, jdbcType=VARCHAR}
@@ -270,7 +269,6 @@
                 and (
                 find_in_set(#{request.currentUser, jdbcType=VARCHAR}, grp.in_charges)
                 or find_in_set(#{request.currentUser, jdbcType=VARCHAR}, grp.followers)
-                or find_in_set(#{request.currentUser, jdbcType=VARCHAR}, approver.approvers)
                 )
             </if>
             <if test="request.keyword != null and request.keyword != ''">