提交 7e9fc5f0 authored 作者: 吕本才's avatar 吕本才

1、增加根据用户ids查询用户信息接口,用于报表模块调用

上级 ce32807d
...@@ -18,12 +18,8 @@ import com.sfa.system.api.domain.SysUser; ...@@ -18,12 +18,8 @@ import com.sfa.system.api.domain.SysUser;
import com.sfa.system.api.model.LoginUser; import com.sfa.system.api.model.LoginUser;
import com.sfa.system.api.pojo.request.UserVo; import com.sfa.system.api.pojo.request.UserVo;
import com.sfa.system.api.pojo.response.UserDto; import com.sfa.system.api.pojo.response.UserDto;
import com.sfa.system.domain.dao.ISysPostDao; import com.sfa.system.domain.dao.*;
import com.sfa.system.domain.dao.ISysUserDao; import com.sfa.system.domain.wq.SysUserWq;
import com.sfa.system.domain.dao.ISysConfigDao;
import com.sfa.system.domain.dao.ISysDeptDao;
import com.sfa.system.domain.dao.ISysPermissionDao;
import com.sfa.system.domain.dao.ISysRoleDao;
import com.sfa.system.pojo.response.SysUserProDto; import com.sfa.system.pojo.response.SysUserProDto;
import com.sfa.system.service.query.IUserQueryService; import com.sfa.system.service.query.IUserQueryService;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
...@@ -34,7 +30,6 @@ import org.springframework.web.multipart.MultipartFile; ...@@ -34,7 +30,6 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -127,9 +122,9 @@ public class SysUserQueryController extends BaseController { ...@@ -127,9 +122,9 @@ public class SysUserQueryController extends BaseController {
@InnerAuth @InnerAuth
@GetMapping("/userInfoById") @GetMapping("/userInfoById")
public R<SysUser> userInfo(Long userId) { public R<SysUser> userInfo(Long userId) {
SysUser user =new SysUser(userId); SysUser user = new SysUser(userId);
List<SysUser> list = userDao.selectUserList(user); List<SysUser> list = userDao.selectUserList(user);
if(ObjectUtil.isEmpty(list)){ if (ObjectUtil.isEmpty(list)) {
return R.fail("用户名或密码错误"); return R.fail("用户名或密码错误");
} }
SysUser sysUser = list.get(0); SysUser sysUser = list.get(0);
...@@ -137,6 +132,15 @@ public class SysUserQueryController extends BaseController { ...@@ -137,6 +132,15 @@ public class SysUserQueryController extends BaseController {
} }
@InnerAuth
@PostMapping("/getUserInfoByIds")
public R<PageInfo<SysUser>> info(@RequestBody List<Long> userIds) {
SysUserWq wq = new SysUserWq();
wq.setUserIds(userIds);
PageInfo pageInfo = userDao.selectUserPage(wq);
return R.ok(pageInfo);
}
/** /**
* 注册用户信息 * 注册用户信息
*/ */
......
...@@ -4,6 +4,7 @@ import lombok.Data; ...@@ -4,6 +4,7 @@ import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* @author : liqiulin * @author : liqiulin
...@@ -33,4 +34,7 @@ public class SysUserWq { ...@@ -33,4 +34,7 @@ public class SysUserWq {
private Long deptId; private Long deptId;
private Boolean existRole; private Boolean existRole;
private List<Long> userIds;
} }
...@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<association property="dept" javaType="com.sfa.system.api.domain.SysDept" resultMap="deptResult" /> <association property="dept" javaType="com.sfa.system.api.domain.SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" /> <collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap> </resultMap>
<resultMap id="deptResult" type="com.sfa.system.api.domain.SysDept"> <resultMap id="deptResult" type="com.sfa.system.api.domain.SysDept">
<id property="deptId" column="dept_id" /> <id property="deptId" column="dept_id" />
<result property="parentId" column="parent_id" /> <result property="parentId" column="parent_id" />
...@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="leader" column="leader" /> <result property="leader" column="leader" />
<result property="status" column="dept_status" /> <result property="status" column="dept_status" />
</resultMap> </resultMap>
<resultMap id="RoleResult" type="com.sfa.system.api.domain.SysRole"> <resultMap id="RoleResult" type="com.sfa.system.api.domain.SysRole">
<id property="roleId" column="role_id" /> <id property="roleId" column="role_id" />
<result property="roleName" column="role_name" /> <result property="roleName" column="role_name" />
...@@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_user_role ur on u.user_id = ur.user_id left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id left join sys_role r on r.role_id = ur.role_id
</sql> </sql>
<select id="selectUserList" parameterType="com.sfa.system.api.domain.SysUser" resultMap="SysUserResult"> <select id="selectUserList" parameterType="com.sfa.system.api.domain.SysUser" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
...@@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) )) AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
</if> </if>
</select> </select>
<select id="selectAllocatedList" parameterType="com.sfa.system.api.domain.SysUser" resultMap="SysUserResult"> <select id="selectAllocatedList" parameterType="com.sfa.system.api.domain.SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
from sys_user u from sys_user u
...@@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND u.phonenumber like concat('%', #{phonenumber}, '%') AND u.phonenumber like concat('%', #{phonenumber}, '%')
</if> </if>
</select> </select>
<select id="selectUnallocatedList" parameterType="com.sfa.system.api.domain.SysUser" resultMap="SysUserResult"> <select id="selectUnallocatedList" parameterType="com.sfa.system.api.domain.SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
from sys_user u from sys_user u
...@@ -121,29 +121,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -121,29 +121,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND u.phonenumber like concat('%', #{phonenumber}, '%') AND u.phonenumber like concat('%', #{phonenumber}, '%')
</if> </if>
</select> </select>
<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult"> <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
<include refid="selectUserVo"/> <include refid="selectUserVo"/>
where u.user_name = #{userName} and u.del_flag = '0' where u.user_name = #{userName} and u.del_flag = '0'
</select> </select>
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult"> <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
<include refid="selectUserVo"/> <include refid="selectUserVo"/>
where u.user_id = #{userId} where u.user_id = #{userId}
</select> </select>
<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult"> <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
select user_id, user_name from sys_user where user_name = #{userName} limit 1 select user_id, user_name from sys_user where user_name = #{userName} limit 1
</select> </select>
<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult"> <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1 select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
</select> </select>
<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult"> <select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1 select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
</select> </select>
<insert id="insertUser" parameterType="com.sfa.system.api.domain.SysUser" useGeneratedKeys="true" keyProperty="userId"> <insert id="insertUser" parameterType="com.sfa.system.api.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user( insert into sys_user(
<if test="userId != null and userId != 0">user_id,</if> <if test="userId != null and userId != 0">user_id,</if>
...@@ -175,7 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -175,7 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sysdate() sysdate()
) )
</insert> </insert>
<update id="updateUser" parameterType="com.sfa.system.api.domain.SysUser"> <update id="updateUser" parameterType="com.sfa.system.api.domain.SysUser">
update sys_user update sys_user
<set> <set>
...@@ -196,28 +196,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -196,28 +196,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</set> </set>
where user_id = #{userId} where user_id = #{userId}
</update> </update>
<update id="updateUserStatus" parameterType="com.sfa.system.api.domain.SysUser"> <update id="updateUserStatus" parameterType="com.sfa.system.api.domain.SysUser">
update sys_user set status = #{status} where user_id = #{userId} update sys_user set status = #{status} where user_id = #{userId}
</update> </update>
<update id="updateUserAvatar" parameterType="com.sfa.system.api.domain.SysUser"> <update id="updateUserAvatar" parameterType="com.sfa.system.api.domain.SysUser">
update sys_user set avatar = #{avatar} where user_name = #{userName} update sys_user set avatar = #{avatar} where user_name = #{userName}
</update> </update>
<update id="resetUserPwd" parameterType="com.sfa.system.api.domain.SysUser"> <update id="resetUserPwd" parameterType="com.sfa.system.api.domain.SysUser">
update sys_user set password = #{password} where user_name = #{userName} update sys_user set password = #{password} where user_name = #{userName}
</update> </update>
<delete id="deleteUserById" parameterType="Long"> <delete id="deleteUserById" parameterType="Long">
update sys_user set del_flag = '2' where user_id = #{userId} update sys_user set del_flag = '2' where user_id = #{userId}
</delete> </delete>
<delete id="deleteUserByIds" parameterType="Long"> <delete id="deleteUserByIds" parameterType="Long">
update sys_user set del_flag = '2' where user_id in update sys_user set del_flag = '2' where user_id in
<foreach collection="array" item="userId" open="(" separator="," close=")"> <foreach collection="array" item="userId" open="(" separator="," close=")">
#{userId} #{userId}
</foreach> </foreach>
</delete> </delete>
...@@ -278,6 +278,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -278,6 +278,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and su.user_id in (select user_id from sys_user_role where role_id = #{sysUserWq.roleId}) and su.user_id in (select user_id from sys_user_role where role_id = #{sysUserWq.roleId})
</if> </if>
</if> </if>
<if test="sysUserWq.userIds != null and !sysUserWq.userIds.isEmpty()">
<foreach collection="sysUserWq.userIds" item="userId" open="and su.user_id in (" separator="," close=")">
#{userId}
</foreach>
</if>
</select> </select>
...@@ -292,4 +297,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -292,4 +297,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where role_id = #{roleId}) where role_id = #{roleId})
where user_id = #{userId} where user_id = #{userId}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论