From 929c01f98f20a26324c4c85b8490bf87ed30d392 Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Wed, 29 Nov 2023 11:44:22 +0800 Subject: [PATCH] Optimize UserConverter --- .../top/fatweb/api/converter/permission/UserConverter.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/top/fatweb/api/converter/permission/UserConverter.kt b/src/main/kotlin/top/fatweb/api/converter/permission/UserConverter.kt index 14fa247..1b0887c 100644 --- a/src/main/kotlin/top/fatweb/api/converter/permission/UserConverter.kt +++ b/src/main/kotlin/top/fatweb/api/converter/permission/UserConverter.kt @@ -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) = PageVo(