From c5a8474e5149c7da9fe645cdda8591dac99430d8 Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Mon, 4 Mar 2024 09:47:28 +0800 Subject: [PATCH] Fix: user management - error changing Administrator user information --- .../oxygen/api/service/permission/impl/UserServiceImpl.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserServiceImpl.kt index d0a4d30..64375b3 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserServiceImpl.kt @@ -223,12 +223,12 @@ class UserServiceImpl( KtUpdateWrapper(User()).eq(User::id, user.id) .set( User::verify, - if (userUpdateParam.verified) null else "${ + if (userUpdateParam.verified || userUpdateParam.id == 0L) null else "${ LocalDateTime.now(ZoneOffset.UTC).toInstant(ZoneOffset.UTC).toEpochMilli() }-${UUID.randomUUID()}-${UUID.randomUUID()}-${UUID.randomUUID()}" ) - .set(User::expiration, user.expiration) - .set(User::credentialsExpiration, user.credentialsExpiration) + .set(User::expiration, if (userUpdateParam.id == 0L) null else user.expiration) + .set(User::credentialsExpiration, if (userUpdateParam.id == 0L) null else user.credentialsExpiration) ) user.userInfo?.let { userInfo ->