Merge remote-tracking branch 'origin/master' into test

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

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

@@ -2,6 +2,7 @@ package com.xy.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -15,8 +16,11 @@ import com.xy.consts.CommConsts;
 import com.xy.consts.SysConstant;
 import com.xy.dto.SysWorkUser.*;
 import com.xy.dto.UserInfoDto;
+import com.xy.dto.be.MercUserDto;
 import com.xy.entity.UserInfo;
 import com.xy.mapper.UserInfoMapper;
+import com.xy.service.be.MercFeignService;
+import com.xy.service.be.MercUserService;
 import com.xy.utils.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -55,6 +59,8 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
 
     private WebMqttConfig webMqttConfig;
 
+    private MercFeignService mercFeignService;
+
 
     @ApiOperation("获取所有售后权限用户ID")
     @Override
@@ -111,6 +117,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
     @ApiOperation("分页查询")
     public R<PageBean<UserInfoDto.Vo>> page(@RequestBody UserInfoDto.Page page) {
         PageBean pageBean = page.getPage();
+        Long sysId = page.getSysId();
         LambdaQueryWrapper<UserInfo> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, UserInfo.class)
                 .like(UserInfo::getTel, page.getTel())
                 .like(UserInfo::getMail, page.getMail())
@@ -125,17 +132,30 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         PageBean<UserInfoDto.Vo> data = toPageBean(UserInfoDto.Vo.class, iPage);
         List<UserInfoDto.Vo> records = data.getRecords();
         if (CollUtil.isNotEmpty(records)) {
+            //商管端，需要展示是否加入团队
+            Map<Long, MercUserDto.Vo> voMap = MapUtil.newHashMap();
+            if (SysConstant.BIZ_PC_SYS_ID.longValue() == sysId.longValue()) {
+                List<Long> userInfoIds = records.stream().map(UserInfoDto.Vo::getUserId).distinct().collect(Collectors.toList());
+                List<MercUserDto.Vo> voList = R.feignCheckData(mercFeignService.getMercUserList(new MercUserDto.SelectList().setUserInfoIds(userInfoIds)));
+                if (CollUtil.isNotEmpty(voList)) {
+                    voMap = voList.stream().collect(Collectors.toMap(MercUserDto.Vo::getUserId, mu -> mu));
+                }
+            }
+
             List<Long> authUserIds = records.stream().map(UserInfoDto.Vo::getAuthorizeUserId).distinct().collect(Collectors.toList());
             List<SysWorkVo> sysWorkVos = R.feignCheckData(sysWorkUserService.list(new ListDto().setSysId(page.getSysId()).setId(authUserIds)));
             Map<Long, SysWorkVo> sysWorkVoMap = sysWorkVos.stream().collect(Collectors.toMap(SysWorkVo::getId, i -> i));
-            records.forEach(r -> {
+            for (UserInfoDto.Vo r : records) {
                 Long authorizeUserId = r.getAuthorizeUserId();
                 SysWorkVo sysWorkVo = sysWorkVoMap.get(authorizeUserId);
                 if (sysWorkVo != null) {
                     r.setDeptIds(sysWorkVo.getDeptIds());
                     r.setDeptNames(sysWorkVo.getDeptNames());
                 }
-            });
+                MercUserDto.Vo mercUser = voMap.get(r.getUserId());
+                r.setHasMercTeam(mercUser != null ? true : false);
+            }
+
             data.setRecords(records);
         }
         return R.ok(data);

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

@@ -168,7 +168,9 @@ public class UserInfoDto {
     @Data
     @Accessors(chain = true)
     public static class Vo {
-
+        @ApiModelProperty(value = "是否拥有团队")
+        private Boolean hasMercTeam;
+        
         @ApiModelProperty(value = "id")
         private Long userId;