From af98c10285171037b093d30e8b0b8e743b6c3121 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Fri, 20 Dec 2024 09:06:10 +0000 Subject: [PATCH] =?UTF-8?q?Revert=20"update=20=E8=8E=B7=E5=8F=96=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=AE=80=E7=95=A5=E4=BF=A1=E6=81=AF=EF=BC=8C=E7=A5=96?= =?UTF-8?q?=E7=BA=A7=E9=83=A8=E9=97=A8=E5=88=97=E8=A1=A8=EF=BC=8C=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E8=B4=9F=E8=B4=A3=E4=BA=BA=E7=AD=89"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e47319597a24dcf7ab77c4326154c057357d7b74. --- .../controller/system/SysUserController.java | 11 --- .../system/domain/vo/UserBriefInfoVo.java | 98 ------------------- .../system/service/ISysUserService.java | 10 -- .../service/impl/SysUserServiceImpl.java | 28 +----- 4 files changed, 4 insertions(+), 143 deletions(-) delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserBriefInfoVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java index d961a5d74..e1e868a6e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java @@ -297,15 +297,4 @@ public class SysUserController extends BaseController { return R.ok(userService.selectUserListByDept(deptId)); } - /** - * 获取用户简略信息，包括部门信息 - * - * @param userId 用户ID - * @return 用户简略信息 - */ - @GetMapping("/getUserBriefInfo/{userId}") - public R getUserBriefInfo(@PathVariable(value = "userId") Long userId) { - return R.ok(userService.getUserBriefInfo(userId)); - } - } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserBriefInfoVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserBriefInfoVo.java deleted file mode 100644 index 1288b8b64..000000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserBriefInfoVo.java +++ /dev/null @@ -1,98 +0,0 @@ -package org.dromara.system.domain.vo; - -import lombok.Data; -import org.dromara.common.sensitive.annotation.Sensitive; -import org.dromara.common.sensitive.core.SensitiveStrategy; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; - -/** - * 用户简略信息 - * - * @author AprilWind - */ -@Data -public class UserBriefInfoVo { - - /** - * 用户ID - */ - private Long userId; - - /** - * 用户账号 - */ - @Sensitive(strategy = SensitiveStrategy.FIRST_MASK, perms = "system:user:edit") - private String userName; - - /** - * 用户昵称 - */ - private String nickName; - - /** - * 租户ID - */ - private String tenantId; - - /** - * 部门ID - */ - private Long deptId; - - /** - * 部门名 - */ - private String deptName; - - /** - * 祖级列表 - */ - private String ancestors; - - /** - * 部门祖级列表名称 - */ - @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "ancestors") - private String ancestorsName; - - /** - * 负责人ID - */ - private Long leader; - - /** - * 负责人昵称 - */ - @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "leader") - private String leaderName; - - /** - * 用户类型（sys_user系统用户） - */ - private String userType; - - /** - * 用户邮箱 - */ - @Sensitive(strategy = SensitiveStrategy.EMAIL, perms = "system:user:edit") - private String email; - - /** - * 手机号码 - */ - @Sensitive(strategy = SensitiveStrategy.PHONE, perms = "system:user:edit") - private String phonenumber; - - /** - * 用户性别（0男 1女 2未知） - */ - private String sex; - - /** - * 头像地址 - */ - @Translation(type = TransConstant.OSS_ID_TO_URL) - private Long avatar; - -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java index 6af142ebc..0325a2558 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java @@ -5,7 +5,6 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.system.domain.bo.SysUserBo; import org.dromara.system.domain.vo.SysUserExportVo; import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.domain.vo.UserBriefInfoVo; import java.util.List; @@ -220,13 +219,4 @@ public interface ISysUserService { * @return 结果 */ List selectUserListByDept(Long deptId); - - /** - * 获取用户简略信息，包括部门信息 - * - * @param userId 用户ID - * @return 用户简略信息 - */ - UserBriefInfoVo getUserBriefInfo(Long userId); - } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index a54a4668b..40811707b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -24,7 +24,10 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.domain.*; import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.*; +import org.dromara.system.domain.vo.SysPostVo; +import org.dromara.system.domain.vo.SysRoleVo; +import org.dromara.system.domain.vo.SysUserExportVo; +import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.mapper.*; import org.dromara.system.service.ISysUserService; import org.springframework.cache.annotation.CacheEvict; @@ -548,29 +551,6 @@ public class SysUserServiceImpl implements ISysUserService, UserService { return baseMapper.selectVoList(lqw); } - /** - * 获取用户简略信息，包括部门信息 - * - * @param userId 用户ID - * @return 用户简略信息 - */ - @Override - public UserBriefInfoVo getUserBriefInfo(Long userId) { - SysUserVo user = baseMapper.selectVoById(userId); - if (ObjectUtil.isNull(user)) { - return null; - } - UserBriefInfoVo briefInfo = BeanUtil.toBean(user, UserBriefInfoVo.class); - SysDept dept = deptMapper.selectById(briefInfo.getDeptId()); - if (ObjectUtil.isNotNull(dept)) { - briefInfo.setDeptId(dept.getDeptId()); - briefInfo.setDeptName(dept.getDeptName()); - briefInfo.setAncestors(dept.getAncestors()); - briefInfo.setLeader(dept.getLeader()); - } - return briefInfo; - } - /** * 通过用户ID查询用户账户 *