From ab97a08f4826d6fa1dc1755d0046623dd711feb8 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Wed, 13 Mar 2024 20:50:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=98=E5=8E=9F=E8=A7=92=E8=89=B2=20I?= =?UTF-8?q?D=20=E5=88=97=E8=A1=A8=E5=92=8C=E9=83=A8=E9=97=A8=20ID=20?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E5=A1=AB=E5=85=85=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Crane4j：当作为数据源容器的方法接受单个参数并返回集合类型结果时，只会填充集合中的首个元素，等待修复后再调整回来 --- .../continew/admin/system/model/resp/RoleDetailResp.java | 6 +----- .../continew/admin/system/model/resp/UserDetailResp.java | 5 +---- .../continew/admin/system/service/impl/RoleServiceImpl.java | 2 ++ .../continew/admin/system/service/impl/UserServiceImpl.java | 3 ++- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleDetailResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleDetailResp.java index 24c9704e..ebb5df05 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleDetailResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleDetailResp.java @@ -16,17 +16,14 @@ package top.charles7c.continew.admin.system.model.resp; -import cn.crane4j.annotation.Assemble; -import cn.crane4j.annotation.Mapping; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.charles7c.continew.admin.common.constant.ContainerConstants; import top.charles7c.continew.admin.common.enums.DataScopeEnum; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; -import top.charles7c.continew.starter.extension.crud.model.resp.BaseDetailResp; import top.charles7c.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; +import top.charles7c.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; import java.util.List; @@ -40,7 +37,6 @@ import java.util.List; @Data @ExcelIgnoreUnannotated @Schema(description = "角色详情信息") -@Assemble(container = ContainerConstants.ROLE_DEPT_ID_LIST, key = "id", props = @Mapping(ref = "deptIds")) public class RoleDetailResp extends BaseDetailResp { @Serial diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/UserDetailResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/UserDetailResp.java index 4e1bd82f..105d0e44 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/UserDetailResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/UserDetailResp.java @@ -16,7 +16,6 @@ package top.charles7c.continew.admin.system.model.resp; -import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.AssembleMethod; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.Mapping; @@ -24,13 +23,12 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.charles7c.continew.admin.common.constant.ContainerConstants; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; import top.charles7c.continew.admin.common.enums.GenderEnum; import top.charles7c.continew.admin.common.util.helper.LoginHelper; import top.charles7c.continew.admin.system.service.DeptService; -import top.charles7c.continew.starter.extension.crud.model.resp.BaseDetailResp; import top.charles7c.continew.starter.extension.crud.converter.ExcelBaseEnumConverter; +import top.charles7c.continew.starter.extension.crud.model.resp.BaseDetailResp; import java.io.Serial; import java.time.LocalDateTime; @@ -46,7 +44,6 @@ import java.util.Objects; @Data @ExcelIgnoreUnannotated @Schema(description = "用户详情信息") -@Assemble(container = ContainerConstants.USER_ROLE_ID_LIST, key = "id", props = @Mapping(ref = "roleIds")) public class UserDetailResp extends BaseDetailResp { @Serial diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java index 4d277b66..b9cab844 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java @@ -131,6 +131,8 @@ public class RoleServiceImpl extends BaseServiceImpl deptIdList = roleDeptService.listDeptIdByRoleId(roleId); + detail.setDeptIds(deptIdList); if (SysConstants.ADMIN_ROLE_CODE.equals(detail.getCode())) { List list = menuService.listAll(); List menuIds = list.stream().map(MenuResp::getId).toList(); diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java index ef3fd45e..f1e16463 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java @@ -153,7 +153,8 @@ public class UserServiceImpl extends BaseServiceImpl roleIdList = detail.getRoleIds(); + List roleIdList = userRoleService.listRoleIdByUserId(detail.getId()); + detail.setRoleIds(roleIdList); if (CollUtil.isNotEmpty(roleIdList)) { detail.setRoleNames(String.join(StringConstants.CHINESE_COMMA, roleService.listNameByIds(roleIdList))); }