gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【SysUserResponse】删除多余的SysUserResponse

pull/3/head
chenjinlong 2021-02-03 17:20:32 +08:00
parent da18b5eec6
commit cbb2a969c4
6 changed files with 17 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserResponse.java
View File

@ -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<Long> grantRoleIdList;
}

6
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserMapper.java
View File

@ -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;

10
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserMapper">
<!--获取用户分页列表-->
<select id="findUserPage" resultType="cn.stylefeng.roses.kernel.system.modular.user.pojo.response.SysUserResponse">
<select id="findUserPage" resultType="cn.stylefeng.roses.kernel.system.pojo.user.SysUserResponse">
select
suser.user_id as userId,
suser.account as account,
@ -31,7 +31,8 @@
and suser.status_flag like concat('%',#{sysUserRequest.statusFlag},'%')
</if>
<if test="sysUserRequest.orgId != null and 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 suorg.org_id in(select org_id from hr_organization where org_pids like CONCAT('%[',#{sysUserRequest.orgId},']%') or
org_id=#{sysUserRequest.orgId})
</if>
and suser.del_flag = 'N'
order by suser.create_time desc
@ -40,7 +41,7 @@
</select>
<!--获取用户列表-->
<select id="findUserList" resultType="cn.stylefeng.roses.kernel.system.modular.user.pojo.response.SysUserResponse">
<select id="findUserList" resultType="cn.stylefeng.roses.kernel.system.pojo.user.SysUserResponse">
select
suser.user_id as userId,
suser.account as account,
@ -68,7 +69,8 @@
and suser.status_flag like concat('%',#{sysUserRequest.statusFlag},'%')
</if>
<if test="sysUserRequest.orgId != null and 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 suorg.org_id in(select org_id from hr_organization where org_pids like CONCAT('%[',#{sysUserRequest.orgId},']%') or
org_id=#{sysUserRequest.orgId})
</if>
and suser.del_flag = 'N'
order by suser.create_time desc

88
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/response/SysUserResponse.java
View File

@ -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<Long> grantRoleIdList;
}

2
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java
View File

@ -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;

6
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java
View File

@ -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;