Finish role add and get

src/main/kotlin/top/fatweb/api/converter/permission/RoleConverter.kt

@@ -5,26 +5,61 @@ import top.fatweb.api.entity.permission.Power
 import top.fatweb.api.entity.permission.Role
 import top.fatweb.api.param.authentication.RoleAddParam
 import top.fatweb.api.vo.PageVo
-import top.fatweb.api.vo.permission.RoleVo
+import top.fatweb.api.vo.permission.*
 
 object RoleConverter {
-    fun rolePageToRolePageVo(rolePage: IPage<Role>): PageVo<RoleVo> = PageVo(
+    fun rolePageToRoleWithPowerPageVo(rolePage: IPage<Role>): PageVo<RoleWithPowerVo> = PageVo(
         rolePage.total,
         rolePage.pages,
         rolePage.size,
         rolePage.current,
         rolePage.records.map {
-            RoleVo(
+            RoleWithPowerVo(
                 id = it.id,
                 name = it.name,
-                enable = it.enable == 1
+                enable = it.enable == 1,
+                modules = it.modules?.map { module ->
+                    ModuleVo(
+                        id = module.id,
+                        name = module.name,
+                        powerId = module.powerId
+                    )
+                },
+                menus = it.menus?.map { menu ->
+                    MenuVo(
+                        id = menu.id,
+                        name = menu.name,
+                        url = menu.url,
+                        powerId = menu.powerId,
+                        parentId = menu.powerId,
+                        moduleId = menu.moduleId
+                    )
+                },
+                elements = it.elements?.map { element ->
+                    ElementVo(
+                        id = element.id,
+                        name = element.name,
+                        powerId = element.powerId,
+                        parentId = element.parentId,
+                        menuId = element.menuId
+                    )
+                },
+                operations = it.operations?.map { operation ->
+                    OperationVo(
+                        id = operation.id,
+                        name = operation.name,
+                        code = operation.code,
+                        powerId = operation.powerId,
+                        elementId = operation.elementId
+                    )
+                }
             )
         }
     )
 
     fun roleAddParamToRole(roleAddParam: RoleAddParam): Role = Role().apply {
         name = roleAddParam.name
-        enable = if (roleAddParam.enable) 1 else 0
+        enable = if (roleAddParam.enable == true) 1 else 0
         powers = roleAddParam.powerIds?.map { Power().apply { id = it } }
     }
 

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

@@ -49,7 +49,8 @@ object UserConverter {
                 name = it.name,
                 url = it.url,
                 powerId = it.powerId,
-                parentId = it.parentId
+                parentId = it.parentId,
+                moduleId = it.moduleId
             )
         },
         elements = user.elements?.map {