[dolphinscheduler] branch dev updated: 修改数据质量查询的权限判断 (#10977)

[caishunfeng]

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

caishunfeng pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new ccb7641468 修改数据质量查询的权限判断 (#10977)
ccb7641468 is described below

commit ccb76414686bf70d3ada7ad2d35fdc21c7b6f659
Author: jackfanwan <61672564+jackfan...@users.noreply.github.com>
AuthorDate: Mon Jul 25 09:35:53 2022 +0800

    修改数据质量查询的权限判断 (#10977)
    
    Co-authored-by: fanwanlong <fanwanl...@kezaihui.com>
---
 .../api/service/impl/DqExecuteResultServiceImpl.java                 | 2 +-
 .../dolphinscheduler/api/service/DqExecuteResultServiceTest.java     | 2 +-
 .../apache/dolphinscheduler/dao/mapper/DqExecuteResultMapper.java    | 5 +++--
 .../org/apache/dolphinscheduler/dao/mapper/DqExecuteResultMapper.xml | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DqExecuteResultServiceImpl.java
 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DqExecuteResultServiceImpl.java
index ae14e9e4af..5b82239295 100644
--- 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DqExecuteResultServiceImpl.java
+++ 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DqExecuteResultServiceImpl.java
@@ -87,7 +87,7 @@ public class DqExecuteResultServiceImpl extends 
BaseServiceImpl implements DqExe
                 dqExecuteResultMapper.queryResultListPaging(
                         page,
                         searchVal,
-                        loginUser.getId(),
+                        loginUser,
                         statusArray,
                         ruleType,
                         start,
diff --git 
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DqExecuteResultServiceTest.java
 
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DqExecuteResultServiceTest.java
index cf380a33bd..fb8b596913 100644
--- 
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DqExecuteResultServiceTest.java
+++ 
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DqExecuteResultServiceTest.java
@@ -85,7 +85,7 @@ public class DqExecuteResultServiceTest {
         page.setTotal(1);
         page.setRecords(getExecuteResultList());
         when(dqExecuteResultMapper.queryResultListPaging(
-                any(IPage.class), eq(""), eq(loginUser.getId()), 
any(),eq(ruleType), eq(start), eq(end))).thenReturn(page);
+                any(IPage.class), eq(""), eq(loginUser), any(),eq(ruleType), 
eq(start), eq(end))).thenReturn(page);
 
         Result result = dqExecuteResultService.queryResultListPaging(
                 loginUser,searchVal,1,0,"2020-01-01 00:00:00","2020-01-02 
00:00:00",1,10);
diff --git 
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/DqExecuteResultMapper.java
 
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/DqExecuteResultMapper.java
index 39fc26e57a..c522019edf 100644
--- 
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/DqExecuteResultMapper.java
+++ 
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/DqExecuteResultMapper.java
@@ -18,6 +18,7 @@
 package org.apache.dolphinscheduler.dao.mapper;
 
 import org.apache.dolphinscheduler.dao.entity.DqExecuteResult;
+import org.apache.dolphinscheduler.dao.entity.User;
 
 import org.apache.ibatis.annotations.Param;
 
@@ -36,7 +37,7 @@ public interface DqExecuteResultMapper extends 
BaseMapper<DqExecuteResult> {
      *
      * @param page page
      * @param searchVal searchVal
-     * @param userId userId
+     * @param user user
      * @param statusArray states
      * @param ruleType ruleType
      * @param startTime startTime
@@ -44,7 +45,7 @@ public interface DqExecuteResultMapper extends 
BaseMapper<DqExecuteResult> {
      */
     IPage<DqExecuteResult> queryResultListPaging(IPage<DqExecuteResult> page,
                                                  @Param("searchVal") String 
searchVal,
-                                                 @Param("userId") int userId,
+                                                 @Param("user") User user,
                                                  @Param("states") int[] 
statusArray,
                                                  @Param("ruleType") int 
ruleType,
                                                  @Param("startTime") Date 
startTime,
diff --git 
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/DqExecuteResultMapper.xml
 
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/DqExecuteResultMapper.xml
index 4fa09a3c4f..5ca517e616 100644
--- 
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/DqExecuteResultMapper.xml
+++ 
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/DqExecuteResultMapper.xml
@@ -62,8 +62,8 @@
                     #{i}
                 </foreach>
             </if>
-            <if test=" userId != 1">
-                and a.user_id = #{userId}
+            <if test=" user.userType.code != 0">
+                and a.user_id = #{user.id}
             </if>
             <if test=" ruleType != -1">
                 and a.rule_type = #{ruleType}