[inlong] branch master updated: [INLONG-7648][Manager] Support list streams by a specific group principal (#7649)

[dockerzhang]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 69397d5a0 [INLONG-7648][Manager] Support list streams by a specific 
group principal (#7649)
69397d5a0 is described below

commit 69397d5a0c725be8937b377e66aa7fbe3379840b
Author: vernedeng <deng...@pku.edu.cn>
AuthorDate: Tue Mar 21 10:05:56 2023 +0800

    [INLONG-7648][Manager] Support list streams by a specific group principal 
(#7649)
---
 .../src/main/resources/mappers/InlongStreamEntityMapper.xml         | 3 +++
 .../apache/inlong/manager/pojo/stream/InlongStreamPageRequest.java  | 6 +++---
 2 files changed, 6 insertions(+), 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 91316ab84..4b4c34af2 100644
--- 
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
+++ 
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
@@ -267,6 +267,9 @@
                     #{status}
                 </foreach>
             </if>
+            <if test="request.inCharge != null and request.inCharges != ''">
+                and find_in_set(#{request.inCharge, jdbcType=VARCHAR}, 
grp.in_charges)
+            </if>
         </where>
         <choose>
             <when test="request.orderField != null and request.orderField != 
'' and request.orderType != null and request.orderType != ''">
diff --git 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamPageRequest.java
 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamPageRequest.java
index 9a8f0763b..f54b80e34 100644
--- 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamPageRequest.java
+++ 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamPageRequest.java
@@ -51,13 +51,13 @@ public class InlongStreamPageRequest extends PageRequest {
     @ApiModelProperty(value = "Stream status list")
     private List<Integer> statusList;
 
+    @ApiModelProperty(value = "Inlong group in charge")
+    private String inCharge;
+
     @ApiModelProperty(value = "Current user", hidden = true)
     private String currentUser;
 
     @ApiModelProperty(value = "weather is admin role.", hidden = true)
     private Boolean isAdminRole;
 
-    @ApiModelProperty(value = "Inlong group in charges", hidden = true)
-    private String inCharges;
-
 }