合并分支 'qa' 到 'master'

src/main/java/com/sfa/system/controller/query/SysUserQueryController.java

@@ -18,12 +18,7 @@ import com.sfa.system.api.domain.SysUser;
 import com.sfa.system.api.model.LoginUser;
 import com.sfa.system.api.pojo.request.UserVo;
 import com.sfa.system.api.pojo.response.UserDto;
-import com.sfa.system.domain.dao.ISysPostDao;
-import com.sfa.system.domain.dao.ISysUserDao;
-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.domain.dao.*;
 import com.sfa.system.pojo.response.SysUserProDto;
 import com.sfa.system.service.query.IUserQueryService;
 import org.apache.commons.lang3.ArrayUtils;
@@ -34,7 +29,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -127,9 +121,9 @@ public class SysUserQueryController extends BaseController {
     @InnerAuth
     @GetMapping("/userInfoById")
     public R<SysUser> userInfo(Long userId) {
-        SysUser user =new SysUser(userId);
+        SysUser user = new SysUser(userId);
         List<SysUser> list = userDao.selectUserList(user);
-        if(ObjectUtil.isEmpty(list)){
+        if (ObjectUtil.isEmpty(list)) {
             return R.fail("用户名或密码错误");
         }
         SysUser sysUser = list.get(0);
@@ -137,6 +131,13 @@ public class SysUserQueryController extends BaseController {
 
     }
 
+    @InnerAuth
+    @PostMapping("/getUserInfoByIds")
+    public R<PageInfo<SysUser>> getUserInfoByIds(@RequestParam("pageSize") Integer pageSize,@RequestParam("pageNum") Integer pageNum,@RequestBody List<Long> userIds) {
+        PageInfo pageInfo = userQueryService.selectUserByIds(userIds);
+        return R.ok(pageInfo);
+    }
+
     /**
      * 注册用户信息
      */

src/main/java/com/sfa/system/domain/dao/impl/SysUserDaoImpl.java

 package com.sfa.system.domain.dao.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sfa.common.core.constant.UserConstants;
 import com.sfa.common.core.enums.ECode;

src/main/java/com/sfa/system/domain/wq/SysUserWq.java

@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author : liqiulin
@@ -33,4 +34,7 @@ public class SysUserWq {
     private Long deptId;
 
     private Boolean existRole;
+
+    private List<Long> userIds;
+
 }

src/main/java/com/sfa/system/service/query/IUserQueryService.java

@@ -5,6 +5,8 @@ import com.sfa.system.api.pojo.request.UserVo;
 import com.sfa.system.api.pojo.response.UserDto;
 import com.sfa.system.pojo.response.SysUserProDto;
 
+import java.util.List;
+
 /**
  * @author : liqiulin
  * @date : 2024-10-31 13
@@ -20,4 +22,6 @@ public interface IUserQueryService {
 
 
     SysUserProDto selectUserPromotion(UserDto userDto);
+
+    PageInfo selectUserByIds(List<Long> userIds);
 }

src/main/java/com/sfa/system/service/query/impl/UserQueryServiceImpl.java

@@ -12,6 +12,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author : liqiulin
  * @date : 2024-10-31 13
@@ -31,7 +33,7 @@ public class UserQueryServiceImpl implements IUserQueryService {
     @Override
     public PageInfo selectUserPage(UserVo userVo) {
         SysUserWq sysUserWq = new SysUserWq();
-        BeanUtils.copyProperties(userVo,sysUserWq);
+        BeanUtils.copyProperties(userVo, sysUserWq);
         sysUserWq.setUserNameLike(userVo.getUserName())
                 .setNickNameLike(userVo.getNickName())
                 .setPhonenumberLike(userVo.getPhonenumber());
@@ -43,4 +45,11 @@ public class UserQueryServiceImpl implements IUserQueryService {
     public SysUserProDto selectUserPromotion(UserDto userDto) {
         return sysUserProDao.selectOne(userDto.getUserName());
     }
+
+    @Override
+    public PageInfo selectUserByIds(List<Long> userIds) {
+        SysUserWq wq = new SysUserWq();
+        wq.setUserIds(userIds);
+        return userDao.selectUserPage(wq);
+    }
 }

src/main/resources/bootstrap-dev.yml

@@ -5,11 +5,11 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 192.168.100.38:8848
+        server-addr: 127.0.0.1:8848
         group: sfa
         namespace: 9fb64726-e415-43e4-9e79-9be8d2666671
       config:
-        server-addr: 192.168.100.38:8848
+        server-addr: 127.0.0.1:8848
         file-extension: yaml
         group: sfa
         namespace: 9fb64726-e415-43e4-9e79-9be8d2666671

src/main/resources/mapper/system/SysUserMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<association property="dept"    javaType="com.sfa.system.api.domain.SysDept"         resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
-	
+
     <resultMap id="deptResult" type="com.sfa.system.api.domain.SysDept">
         <id     property="deptId"    column="dept_id"     />
         <result property="parentId"  column="parent_id"   />
@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="leader"    column="leader"      />
         <result property="status"    column="dept_status" />
     </resultMap>
-	
+
     <resultMap id="RoleResult" type="com.sfa.system.api.domain.SysRole">
         <id     property="roleId"       column="role_id"        />
         <result property="roleName"     column="role_name"      />
@@ -70,7 +70,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_role r on r.role_id = ur.role_id
     </sql>
-    
+
     <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
 		left join sys_dept d on u.dept_id = d.dept_id
@@ -91,7 +91,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) ))
 		</if>
 	</select>
-	
+
 	<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
 	    from sys_user u
@@ -106,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
 		</if>
 	</select>
-	
+
 	<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
 	    from sys_user u
@@ -122,29 +122,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
 		</if>
 	</select>
-	
+
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
 	    <include refid="selectUserVo"/>
 		where u.user_name = #{userName} and u.del_flag = '0'
 	</select>
-	
+
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
 		where u.user_id = #{userId}
 	</select>
-	
+
 	<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, user_name from sys_user where user_name = #{userName} limit 1
 	</select>
-	
+
 	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
 	</select>
-	
+
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
-	
+
 	<insert id="insertUser" parameterType="com.sfa.system.api.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(
  			<if test="userId != null and userId != 0">user_id,</if>
@@ -176,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			sysdate()
  		)
 	</insert>
-	
+
 	<update id="updateUser" parameterType="com.sfa.system.api.domain.SysUser">
  		update sys_user
  		<set>
@@ -197,28 +197,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		</set>
  		where user_id = #{userId}
 	</update>
-	
+
 	<update id="updateUserStatus" parameterType="com.sfa.system.api.domain.SysUser">
  		update sys_user set status = #{status} where user_id = #{userId}
 	</update>
-	
+
 	<update id="updateUserAvatar" parameterType="com.sfa.system.api.domain.SysUser">
  		update sys_user set avatar = #{avatar} where user_name = #{userName}
 	</update>
-	
+
 	<update id="resetUserPwd" parameterType="com.sfa.system.api.domain.SysUser">
  		update sys_user set password = #{password} where user_name = #{userName}
 	</update>
-	
+
 	<delete id="deleteUserById" parameterType="Long">
  		update sys_user set del_flag = '2' where user_id = #{userId}
  	</delete>
- 	
+
  	<delete id="deleteUserByIds" parameterType="Long">
  		update sys_user set del_flag = '2' where user_id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}
-        </foreach> 
+        </foreach>
  	</delete>
 
 
@@ -279,6 +279,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})
 			</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>
 
@@ -293,4 +298,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 						where role_id = #{roleId})
 		where user_id = #{userId}
 	</update>
-</mapper> 
+</mapper>
\ No newline at end of file