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

Complete core functions #9

Merged
FatttSnake merged 171 commits from FatttSnake into dev 2024-02-23 11:56:35 +08:00
Conversation 0 Commits 171 Files Changed 381 +10 -1
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 660f879ccd - Show all commits

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"))
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)
if (userIdsIPage.total > 0) {
userPage.setRecords(baseMapper.selectListWithRoleInfoByIds(userIdsIPage.records))
@@ -171,6 +176,10 @@ class UserServiceImpl(
oldGroupList.toSet().let { addGroupIds.removeAll(it) }
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 ->
userInfoService.getOne(