FatttSnake/oxygen-api
1
0
Fork 0
Code Pull Requests Activity

Fix: user management - error changing Administrator user information #13

Merged
FatttSnake merged 1 commits from FatttSnake into dev 2024-03-04 09:58:03 +08:00
Conversation 0 Commits 1 Files Changed 1 +3 -3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c5a8474e51 - Show all commits

6
src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserServiceImpl.kt
View File

@@ -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 ->