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 +2 -2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 929c01f98f - Show all commits

4
src/main/kotlin/top/fatweb/api/converter/permission/UserConverter.kt
View File

@@ -154,8 +154,8 @@ object UserConverter {
avatar = userUpdateParam.avatar
email = userUpdateParam.email
}
roles = userUpdateParam.roleIds?.map { Role().apply { id = it } }
groups = userUpdateParam.groupIds?.map { Group().apply { id = it } }
roles = if (userUpdateParam.id != 0L) userUpdateParam.roleIds?.map { Role().apply { id = it } } else null
groups = if (userUpdateParam.id != 0L) userUpdateParam.groupIds?.map { Group().apply { id = it } } else null
}
fun userPageToUserWithRoleInfoPageVo(userPage: IPage<User>) = PageVo(