You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by we...@apache.org on 2022/08/24 03:55:26 UTC
[dolphinscheduler] branch dev updated: [Improvement][User] Query all users filter un enabled. (#11504)
This is an automated email from the ASF dual-hosted git repository.
wenjun 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 961e67f524 [Improvement][User] Query all users filter un enabled. (#11504)
961e67f524 is described below
commit 961e67f5244ec0a9d445582b0d2a416f4c9f2ece
Author: JiPeng Wang <10...@users.noreply.github.com>
AuthorDate: Wed Aug 24 11:55:18 2022 +0800
[Improvement][User] Query all users filter un enabled. (#11504)
* user query all filter un enabled
* restore permissions
---
.../dolphinscheduler/api/service/impl/UsersServiceImpl.java | 9 +--------
.../apache/dolphinscheduler/api/service/UsersServiceTest.java | 3 +--
.../java/org/apache/dolphinscheduler/dao/mapper/UserMapper.java | 9 ++-------
.../org/apache/dolphinscheduler/dao/mapper/UserMapper.xml | 6 ++++++
4 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
index 0517e95caf..95b441312c 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
@@ -80,7 +80,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -977,13 +976,7 @@ public class UsersServiceImpl extends BaseServiceImpl implements UsersService {
putMsg(result, Status.USER_NO_OPERATION_PERM);
return result;
}
-
- QueryWrapper<User> queryWrapper = new QueryWrapper<>();
- queryWrapper.ge("id", 0);
- if (loginUser.getUserType().equals(UserType.GENERAL_USER)) {
- queryWrapper.eq("id", loginUser.getId());
- }
- List<User> userList = userMapper.selectList(null);
+ List<User> userList = userMapper.queryEnabledUsers();
result.put(Constants.DATA_LIST, userList);
putMsg(result, Status.SUCCESS);
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java
index cfb53e980d..1fc13c2198 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java
@@ -252,7 +252,6 @@ public class UsersServiceTest {
user.setUserType(UserType.ADMIN_USER);
user.setId(1);
- //no operate
Mockito.when(resourcePermissionCheckService.operationPermissionCheck(AuthorizationType.ACCESS_TOKEN,null, 1, USER_MANAGER, serviceLogger)).thenReturn(true);
Mockito.when(resourcePermissionCheckService.resourcePermissionCheck(AuthorizationType.ACCESS_TOKEN, null, 0, serviceLogger)).thenReturn(false);
Map<String, Object> result = usersService.queryUserList(user);
@@ -263,7 +262,7 @@ public class UsersServiceTest {
Mockito.when(resourcePermissionCheckService.operationPermissionCheck(AuthorizationType.ACCESS_TOKEN,null, 1, USER_MANAGER, serviceLogger)).thenReturn(true);
Mockito.when(resourcePermissionCheckService.resourcePermissionCheck(AuthorizationType.ACCESS_TOKEN, null, 0, serviceLogger)).thenReturn(true);
user.setUserType(UserType.ADMIN_USER);
- when(userMapper.selectList(null)).thenReturn(getUserList());
+ when(userMapper.queryEnabledUsers()).thenReturn(getUserList());
result = usersService.queryUserList(user);
List<User> userList = (List<User>) result.get(Constants.DATA_LIST);
Assert.assertTrue(userList.size() > 0);
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UserMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UserMapper.java
index 40d5a3a43b..a58299806f 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UserMapper.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UserMapper.java
@@ -174,13 +174,8 @@ public interface UserMapper extends BaseMapper<User> {
List<User> queryAuthedUserListByProjectId(@Param("projectId") int projectId);
/**
- * list authorized User
- * @param userId
- * @param resourcesIds
- * @param <T>
+ * query enabled users
* @return
*/
- <T> List<User> listAuthorizedUsersList (@Param("userId") int userId, @Param("resourcesIds")T[] resourcesIds);
-
-
+ List<User> queryEnabledUsers();
}
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UserMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UserMapper.xml
index e38688939c..f6b216195c 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UserMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UserMapper.xml
@@ -131,4 +131,10 @@
from t_ds_user u, t_ds_relation_project_user rel
where u.id = rel.user_id and rel.project_id = #{projectId}
</select>
+ <select id="queryEnabledUsers" resultType="org.apache.dolphinscheduler.dao.entity.User">
+ select
+ <include refid="baseSql"/>
+ from t_ds_user
+ where state = 1
+ </select>
</mapper>