From cbb2a969c4f92f53d86b127453d5b6a82e50783f Mon Sep 17 00:00:00 2001 From: chenjinlong <22208488@qq.com> Date: Wed, 3 Feb 2021 17:20:32 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90SysUserResponse=E3=80=91=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84SysUserResponse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/pojo/user/SysUserResponse.java | 6 ++ .../modular/user/mapper/SysUserMapper.java | 6 +- .../user/mapper/mapping/SysUserMapper.xml | 10 ++- .../user/pojo/response/SysUserResponse.java | 88 ------------------- .../modular/user/service/SysUserService.java | 2 +- .../user/service/impl/SysUserServiceImpl.java | 6 +- 6 files changed, 17 insertions(+), 101 deletions(-) delete mode 100644 kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/response/SysUserResponse.java diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserResponse.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserResponse.java index 16d4d3474..6d2d6f96c 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserResponse.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserResponse.java @@ -3,6 +3,7 @@ package cn.stylefeng.roses.kernel.system.pojo.user; import lombok.Data; import java.util.Date; +import java.util.List; /** * 系统用户结果 @@ -78,4 +79,9 @@ public class SysUserResponse { */ private Integer statusFlag; + /** + * 用户角色id + */ + private List grantRoleIdList; + } diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserMapper.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserMapper.java index e55c91aaa..b4a29d65f 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserMapper.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserMapper.java @@ -1,10 +1,10 @@ package cn.stylefeng.roses.kernel.system.modular.user.mapper; +import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser; +import cn.stylefeng.roses.kernel.system.pojo.user.SysUserResponse; +import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser; -import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; -import cn.stylefeng.roses.kernel.system.modular.user.pojo.response.SysUserResponse; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml index 1b4b7e3e8..d01aac414 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml @@ -3,7 +3,7 @@ - select suser.user_id as userId, suser.account as account, @@ -31,7 +31,8 @@ and suser.status_flag like concat('%',#{sysUserRequest.statusFlag},'%') - and suorg.org_id in(select org_id from hr_organization where org_pids like CONCAT('%[',#{sysUserRequest.orgId},']%') or org_id=#{sysUserRequest.orgId}) + and suorg.org_id in(select org_id from hr_organization where org_pids like CONCAT('%[',#{sysUserRequest.orgId},']%') or + org_id=#{sysUserRequest.orgId}) and suser.del_flag = 'N' order by suser.create_time desc @@ -40,7 +41,7 @@ - select suser.user_id as userId, suser.account as account, @@ -68,7 +69,8 @@ and suser.status_flag like concat('%',#{sysUserRequest.statusFlag},'%') - and suorg.org_id in(select org_id from hr_organization where org_pids like CONCAT('%[',#{sysUserRequest.orgId},']%') or org_id=#{sysUserRequest.orgId}) + and suorg.org_id in(select org_id from hr_organization where org_pids like CONCAT('%[',#{sysUserRequest.orgId},']%') or + org_id=#{sysUserRequest.orgId}) and suser.del_flag = 'N' order by suser.create_time desc diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/response/SysUserResponse.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/response/SysUserResponse.java deleted file mode 100644 index 1c5875cff..000000000 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/response/SysUserResponse.java +++ /dev/null @@ -1,88 +0,0 @@ -package cn.stylefeng.roses.kernel.system.modular.user.pojo.response; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * 系统用户结果 - * - * @author fengshuonan - * @date 2020/4/2 9:19 - */ -@Data -public class SysUserResponse { - - /** - * 主键 - */ - private Long userId; - - /** - * 账号 - */ - private String account; - - /** - * 昵称 - */ - private String nickName; - - /** - * 姓名 - */ - private String realName; - - /** - * 头像 - */ - private Long avatar; - - /** - * 生日 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date birthday; - - /** - * 性别（M-男，F-女） - */ - private String sex; - - /** - * 邮箱 - */ - private String email; - - /** - * 手机 - */ - private String phone; - - /** - * 电话 - */ - private String tel; - - /** - * 用户所属机构 - */ - private Long orgId; - - /** - * 用户所属机构的职务 - */ - private Long positionId; - - /** - * 状态 - */ - private Integer statusFlag; - - /** - * 用户角色id - */ - private List grantRoleIdList; -} diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java index 539a452ac..e320df553 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java @@ -5,7 +5,7 @@ import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; import cn.stylefeng.roses.kernel.rule.pojo.tree.UserSelectTreeNode; import cn.stylefeng.roses.kernel.system.UserServiceApi; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser; -import cn.stylefeng.roses.kernel.system.modular.user.pojo.response.SysUserResponse; +import cn.stylefeng.roses.kernel.system.pojo.user.SysUserResponse; import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java index 01a1b7296..8b3c2897d 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java @@ -36,7 +36,6 @@ import cn.stylefeng.roses.kernel.system.modular.user.factory.OnlineUserCreateFac import cn.stylefeng.roses.kernel.system.modular.user.factory.SysUserCreateFactory; import cn.stylefeng.roses.kernel.system.modular.user.factory.UserLoginInfoFactory; import cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserMapper; -import cn.stylefeng.roses.kernel.system.modular.user.pojo.response.SysUserResponse; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserDataScopeService; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserOrgService; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserRoleService; @@ -44,10 +43,7 @@ import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserService; import cn.stylefeng.roses.kernel.system.pojo.organization.DataScopeResponse; import cn.stylefeng.roses.kernel.system.pojo.organization.HrOrganizationResponse; import cn.stylefeng.roses.kernel.system.pojo.role.response.SysRoleResponse; -import cn.stylefeng.roses.kernel.system.pojo.user.OnlineUserResponse; -import cn.stylefeng.roses.kernel.system.pojo.user.SysUserDTO; -import cn.stylefeng.roses.kernel.system.pojo.user.SysUserOrgResponse; -import cn.stylefeng.roses.kernel.system.pojo.user.UserLoginInfoDTO; +import cn.stylefeng.roses.kernel.system.pojo.user.*; import cn.stylefeng.roses.kernel.system.pojo.user.request.OnlineUserRequest; import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; import cn.stylefeng.roses.kernel.system.util.DataScopeUtil;