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

Fix can not remove expiration and credentialsExpiration from user bug

Browse Source
This commit is contained in:
Fat Snake
2023-12-22 15:42:09 +08:00
parent c40bb0bbaa
commit 660f879ccd
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,7 +84,12 @@ class UserServiceImpl(
PageUtil.setPageSort(userGetParam, userIdsPage, OrderItem.asc("id")) PageUtil.setPageSort(userGetParam, userIdsPage, OrderItem.asc("id"))
val userIdsIPage = val userIdsIPage =
baseMapper.selectPage(userIdsPage,userGetParam?.searchType ?: "ALL", userGetParam?.searchValue, userGetParam?.searchRegex ?: false) baseMapper.selectPage(
userIdsPage,
userGetParam?.searchType ?: "ALL",
userGetParam?.searchValue,
userGetParam?.searchRegex ?: false
)
val userPage = Page<User>(userIdsIPage.current, userIdsIPage.size, userIdsIPage.total) val userPage = Page<User>(userIdsIPage.current, userIdsIPage.size, userIdsIPage.total)
if (userIdsIPage.total > 0) { if (userIdsIPage.total > 0) {
userPage.setRecords(baseMapper.selectListWithRoleInfoByIds(userIdsIPage.records)) userPage.setRecords(baseMapper.selectListWithRoleInfoByIds(userIdsIPage.records))
@@ -171,6 +176,10 @@ class UserServiceImpl(
oldGroupList.toSet().let { addGroupIds.removeAll(it) } oldGroupList.toSet().let { addGroupIds.removeAll(it) }
baseMapper.updateById(user) baseMapper.updateById(user)
baseMapper.update(
KtUpdateWrapper(User()).eq(User::id, user.id).set(User::expiration, user.expiration)
.set(User::credentialsExpiration, user.credentialsExpiration)
)
user.userInfo?.let { userInfo -> user.userInfo?.let { userInfo ->
userInfoService.getOne( userInfoService.getOne(