From 4b759541dfa1de220f176b5688e0e46b3414e388 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 18 九月 2023 18:08:28 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
index 790a4ee..f376d09 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
@@ -7,21 +7,24 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.shop.domain.dto.*;
-import com.ruoyi.shop.domain.pojo.task.*;
+import com.ruoyi.shop.domain.pojo.task.ShopTask;
+import com.ruoyi.shop.domain.pojo.task.ShopTaskRecord;
+import com.ruoyi.shop.domain.pojo.task.TaskFile;
import com.ruoyi.shop.domain.vo.StaffShopTaskPageVo;
import com.ruoyi.shop.mapper.task.ShopTaskMapper;
import com.ruoyi.shop.service.task.ShopTaskRecordService;
import com.ruoyi.shop.service.task.ShopTaskService;
import com.ruoyi.shop.service.task.TaskFileService;
-import com.ruoyi.system.api.domain.poji.sys.SysUser;
+import com.ruoyi.system.api.domain.poji.sys.SysStaff;
import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
+import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteUserService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* <p>
@@ -45,6 +48,9 @@
@Resource
private RemoteUserService remoteUserService;
+
+ @Resource
+ private RemoteConfigService remoteConfigService;
/**
* 平台跟进商户
@@ -156,14 +162,23 @@
List<StaffShopTaskPageVo> shopTaskPageVoList = shopTaskMapper.pageStaffShopTask(page, staffShopTaskPageDto);
if(shopTaskPageVoList!=null&&shopTaskPageVoList.size()>0){
Long userId;
- SysUser sysUser;
+ SysStaff sysStaff;
+ HashSet<Long> userIdSet = new HashSet<>();
+ for(StaffShopTaskPageVo staffShopTaskPageVo : shopTaskPageVoList){
+ userIdSet.add(staffShopTaskPageVo.getUserId());
+ }
+ List<Long> useIdList = new ArrayList<>(userIdSet);
+ List<SysStaff> sysStaffList = remoteConfigService.listSysStaffByIds(useIdList).getData();
+ Map<Long,SysStaff> sysStaffMap = sysStaffList.stream()
+ .collect(Collectors.toMap(SysStaff::getUserId, Function.identity()));
for(StaffShopTaskPageVo staffShopTaskPageVo : shopTaskPageVoList){
//获取任务用户信息
userId = staffShopTaskPageVo.getUserId();
if(userId!=null){
- sysUser = remoteUserService.getSysUser(userId).getData();
- staffShopTaskPageVo.setUserName(sysUser.getNickName());
- staffShopTaskPageVo.setUserPicture(sysUser.getAvatar());
+ sysStaff = sysStaffMap.get(userId);
+ staffShopTaskPageVo.setUserName(sysStaff.getStaffName());
+ staffShopTaskPageVo.setUserPicture(sysStaff.getStaffAvatar());
+ staffShopTaskPageVo.setUserPosition(sysStaff.getStaffPost());
}
}
}
--
Gitblit v1.7.1