|
@@ -19,6 +19,8 @@ import com.qqflow.engine.domain.system.mapper.SysUserMapper;
|
|
|
import com.qqflow.engine.domain.system.mapper.SysUserRoleMapper;
|
|
import com.qqflow.engine.domain.system.mapper.SysUserRoleMapper;
|
|
|
import com.qqflow.engine.domain.system.service.SysDeptService;
|
|
import com.qqflow.engine.domain.system.service.SysDeptService;
|
|
|
import com.qqflow.engine.domain.system.service.SysUserService;
|
|
import com.qqflow.engine.domain.system.service.SysUserService;
|
|
|
|
|
+import com.qqflow.engine.domain.ewechat.po.EnterpriseWechatMember;
|
|
|
|
|
+import com.qqflow.engine.domain.ewechat.mapper.EnterpriseWechatMemberMapper;
|
|
|
import jakarta.annotation.Resource;
|
|
import jakarta.annotation.Resource;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.context.annotation.Lazy;
|
|
import org.springframework.context.annotation.Lazy;
|
|
@@ -59,6 +61,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
|
|
|
private SysDeptService sysDeptService;
|
|
private SysDeptService sysDeptService;
|
|
|
|
|
|
|
|
@Resource
|
|
@Resource
|
|
|
|
|
+ private EnterpriseWechatMemberMapper wecomMemberMapper;
|
|
|
|
|
+
|
|
|
|
|
+ @Resource
|
|
|
private PasswordEncoder passwordEncoder;
|
|
private PasswordEncoder passwordEncoder;
|
|
|
|
|
|
|
|
@Lazy
|
|
@Lazy
|
|
@@ -236,6 +241,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
|
|
|
dto.setRoleIds(roleIds);
|
|
dto.setRoleIds(roleIds);
|
|
|
return dto;
|
|
return dto;
|
|
|
}).collect(Collectors.toList());
|
|
}).collect(Collectors.toList());
|
|
|
|
|
+
|
|
|
|
|
+ // 批量查询企微成员名称
|
|
|
|
|
+ List<String> wecomUserIds = dtoList.stream().map(UserDTO::getWecomUserId)
|
|
|
|
|
+ .filter(Objects::nonNull).filter(s -> !s.isBlank()).distinct().toList();
|
|
|
|
|
+ if (!wecomUserIds.isEmpty()) {
|
|
|
|
|
+ Map<String, String> nameMap = wecomMemberMapper.selectList(
|
|
|
|
|
+ new LambdaQueryWrapper<EnterpriseWechatMember>().in(EnterpriseWechatMember::getUserid, wecomUserIds))
|
|
|
|
|
+ .stream().collect(Collectors.toMap(EnterpriseWechatMember::getUserid, EnterpriseWechatMember::getName, (a, b) -> a));
|
|
|
|
|
+ dtoList.forEach(dto -> {
|
|
|
|
|
+ if (dto.getWecomUserId() != null) dto.setWecomUserName(nameMap.get(dto.getWecomUserId()));
|
|
|
|
|
+ });
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
Page<UserDTO> resultPage = new Page<>(userPage.getCurrent(), userPage.getSize(), userPage.getTotal());
|
|
Page<UserDTO> resultPage = new Page<>(userPage.getCurrent(), userPage.getSize(), userPage.getTotal());
|
|
|
resultPage.setRecords(dtoList);
|
|
resultPage.setRecords(dtoList);
|
|
|
return resultPage;
|
|
return resultPage;
|