From b63b98b35d9c17f3669c9cff307d11fe558c6209 Mon Sep 17 00:00:00 2001 From: BBIT-Kai <2911862937@qq.com> Date: Mon, 25 May 2026 14:53:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/kotlin/com/bbit/ticket/dao/system/UserDao.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/server/src/main/kotlin/com/bbit/ticket/dao/system/UserDao.kt b/server/src/main/kotlin/com/bbit/ticket/dao/system/UserDao.kt index e0c8154..0ce821a 100644 --- a/server/src/main/kotlin/com/bbit/ticket/dao/system/UserDao.kt +++ b/server/src/main/kotlin/com/bbit/ticket/dao/system/UserDao.kt @@ -20,7 +20,6 @@ import org.jetbrains.exposed.v1.core.eq import org.jetbrains.exposed.v1.core.inList import org.jetbrains.exposed.v1.core.isNull import org.jetbrains.exposed.v1.core.like -import org.jetbrains.exposed.v1.jdbc.Query import org.jetbrains.exposed.v1.jdbc.deleteWhere import org.jetbrains.exposed.v1.jdbc.insert import org.jetbrains.exposed.v1.jdbc.insertIgnore @@ -59,10 +58,10 @@ object UserDao { } fun findByUsername(username: String): ResultRow? = - activeUsers().where { SysUserTable.username eq username }.singleOrNull() + SysUserTable.selectAll().where { activeWhere() and (SysUserTable.username eq username) }.singleOrNull() fun requireActive(id: Uuid): ResultRow = - activeUsers().where { SysUserTable.id eq id }.singleOrNull() + SysUserTable.selectAll().where { activeWhere() and (SysUserTable.id eq id) }.singleOrNull() ?: throw BizException( ErrorCode.USER_NOT_FOUND.code, ErrorCode.USER_NOT_FOUND.message, @@ -179,11 +178,10 @@ object UserDao { } } - private fun activeUsers(): Query = - SysUserTable.selectAll().where { SysUserTable.deletedAt.isNull() } + private fun activeWhere(): Op = SysUserTable.deletedAt.isNull() private fun buildWhere(username: String?, nickname: String?, status: String?, orgId: Uuid?): Op { - var where: Op = SysUserTable.deletedAt.isNull() + var where: Op = activeWhere() if (!username.isNullOrBlank()) { where = where and (SysUserTable.username like "%$username%") }