From 4f5a67c7f831fbff6d13f8fb3d6af93e60e5c231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 5 Mar 2025 09:55:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/controller/admin/SysController.java | 12 ++++++++++++ .../com/czg/account/service/SysUserService.java | 3 +++ .../java/com/czg/account/vo/SysUserDetailVO.java | 14 ++++++++++++++ .../account/service/impl/SysUserServiceImpl.java | 10 ++++++++++ 4 files changed, 39 insertions(+) create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/account/vo/SysUserDetailVO.java diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/SysController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/SysController.java index 09163d77..b3125c14 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/SysController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/SysController.java @@ -5,6 +5,7 @@ import com.czg.account.dto.user.SysUserEditDTO; import com.czg.account.entity.SysUser; import com.czg.account.entity.SysUsersRoles; import com.czg.account.service.SysUserService; +import com.czg.account.vo.SysUserDetailVO; import com.czg.annotation.SaAdminCheckPermission; import com.czg.annotation.SaAdminCheckRole; import com.czg.resp.CzgResult; @@ -41,6 +42,17 @@ public class SysController { return CzgResult.success(sysUserService.getPage(key, startTime, endTime, status)); } + /** + * 员工相信信息 + * @param id 用户id + * @return 员工信息 + */ + @SaAdminCheckRole("admin") + @GetMapping("/detail") + public CzgResult detail(@RequestParam Integer id) { + return CzgResult.success(sysUserService.detail(id)); + } + /** * 系统账号修改 * @param sysUserEditDTO 修改信息 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysUserService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysUserService.java index 4a92c625..d7c90722 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysUserService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysUserService.java @@ -3,6 +3,7 @@ package com.czg.account.service; import com.czg.account.dto.user.SysUserAddDTO; import com.czg.account.dto.user.SysUserEditDTO; import com.czg.account.entity.SysUser; +import com.czg.account.vo.SysUserDetailVO; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; import jakarta.servlet.http.HttpServletResponse; @@ -32,4 +33,6 @@ public interface SysUserService extends IService { Boolean add(SysUserAddDTO sysUserAddDTO); void download(String key, String startTime, String endTime, Integer status, HttpServletResponse response) throws IOException; + + SysUserDetailVO detail(Integer id); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/SysUserDetailVO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/SysUserDetailVO.java new file mode 100644 index 00000000..1c595d53 --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/SysUserDetailVO.java @@ -0,0 +1,14 @@ +package com.czg.account.vo; + +import com.czg.account.entity.SysUser; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author Administrator + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class SysUserDetailVO extends SysUser { + private Long roleId; +} diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysUserServiceImpl.java index 578e9f1e..a216ff25 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysUserServiceImpl.java @@ -12,6 +12,7 @@ import com.czg.account.entity.SysRole; import com.czg.account.entity.SysUser; import com.czg.account.entity.SysUsersRoles; import com.czg.account.service.SysUserService; +import com.czg.account.vo.SysUserDetailVO; import com.czg.exception.ApiNotPrintException; import com.czg.exception.CzgException; import com.czg.sa.StpKit; @@ -193,4 +194,13 @@ public class SysUserServiceImpl extends ServiceImpl imp writer.flush(response.getOutputStream(), true); writer.close(); } + + @Override + public SysUserDetailVO detail(Integer id) { + SysUser sysUser = getById(id); + SysUsersRoles usersRoles = sysUsersRolesMapper.selectOneByQuery(new QueryWrapper().eq(SysUsersRoles::getUserId, id)); + SysUserDetailVO sysUserDetailVO = BeanUtil.copyProperties(sysUser, SysUserDetailVO.class); + sysUserDetailVO.setRoleId(usersRoles.getRoleId()); + return sysUserDetailVO; + } }