bug: 过滤掉锁定用户 #2269

TencentBlueKing · Jun 17, 2024 · 3993ac7 · 3993ac7
1 parent c4744a2
commit 3993ac7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...d/auth/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/controller/user/UserController.kt b/...d/auth/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/controller/user/UserController.kt
@@ -240,6 +240,7 @@ class UserController @Autowired constructor(
 
     @ApiOperation("校验用户token")
     @PostMapping("/token")
+    @Deprecated("no need work")
     fun checkToken(@RequestParam uid: String, @RequestParam token: String): Response<Boolean> {
         preCheckContextUser(uid)
         userService.findUserByUserToken(uid, token) ?: return ResponseBuilder.success(false)

diff --git a/...ckend/auth/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/util/query/UserQueryHelper.kt b/...ckend/auth/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/util/query/UserQueryHelper.kt
@@ -13,7 +13,7 @@ object UserQueryHelper {
             Criteria.where(TUser::pwd.name).`is`(hashPwd),
             Criteria.where("tokens.id").`is`(pwd),
             Criteria.where("tokens.id").`is`(sm3HashPwd)
-        ).and(TUser::userId.name).`is`(userId)
+        ).and(TUser::userId.name).`is`(userId).and(TUser::locked.name).`is`(false)
         return query(criteria)
     }