Merge branch 'master' of http://119.96.213.127:9006/lijin/xy-sys

sys-api-service/src/main/java/com/xy/service/UserInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xy.service;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -42,6 +43,22 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
 
     private SysWorkUserService sysWorkUserService;
 
+
+    @Override
+    @ApiOperation("集合查询")
+    public R<List<UserInfoDto.Vo>> list(UserInfoDto.SelectListDto selectList) {
+        List<Long> userIds = selectList.getUserIds();
+        UserInfoDto.Vo userVo = selectList.getUserVo();
+        LambdaQueryWrapper<UserInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if (userVo != null) {
+            lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(selectList.getUserVo(), UserInfo.class).build();
+        }
+        lambdaQueryWrapper.in(CollUtil.isNotEmpty(userIds), UserInfo::getUserId, userIds);
+        List<UserInfo> list = list(lambdaQueryWrapper);
+        return R.ok(copy(UserInfoDto.Vo.class, list));
+    }
+
+
     @Override
     @ApiOperation("对象查询")
     public R<UserInfoDto.Vo> obj(UserInfoDto.Vo vo) {
@@ -149,4 +166,4 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         updateById(updateInfo);
         return R.ok();
     }
-}
+}

sys-api/src/main/java/com/xy/dto/UserInfoDto.java

@@ -27,6 +27,16 @@ import java.util.List;
  */
 public class UserInfoDto {
 
+    @Data
+    @Accessors(chain = true)
+    public static class SelectListDto {
+        @ApiModelProperty("用户ID集合")
+        private List<Long> userIds;
+        @ApiModelProperty("用户对象Vo")
+        private Vo userVo;
+    }
+
+
     @Data
     @Accessors(chain = true)
     public static class Page extends Vo {
@@ -86,6 +96,9 @@ public class UserInfoDto {
     @Accessors(chain = true)
     public static class Update {
 
+        @ApiModelProperty(value = "用户昵称")
+        private String name;
+
         @NotNull(message = "userId不能为空")
         @ApiModelProperty(value = "id")
         private Long userId;
@@ -119,6 +132,9 @@ public class UserInfoDto {
         @ApiModelProperty(value = "id")
         private Long userId;
 
+        @ApiModelProperty(value = "用户昵称")
+        private String name;
+
         @ApiModelProperty(value = "手机号")
         private String tel;
 

sys-api/src/main/java/com/xy/service/UserInfoService.java

@@ -7,6 +7,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 服务类
@@ -18,6 +20,17 @@ import org.springframework.web.bind.annotation.RequestBody;
 @RestMappingController("/user-info")
 public interface UserInfoService {
 
+
+    /**
+     * 集合查询
+     *
+     * @param selectList
+     * @return
+     */
+    @PostMapping("list")
+    R<List<UserInfoDto.Vo>> list(@RequestBody UserInfoDto.SelectListDto selectList);
+
+
     /**
      * 对象查询
      *