|
@@ -929,7 +929,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
//查询结果
|
|
//查询结果
|
|
|
List<Map> list = sql.getList(Map.class);
|
|
List<Map> list = sql.getList(Map.class);
|
|
|
if(CollectionUtils.isNotEmpty(list)){
|
|
if(CollectionUtils.isNotEmpty(list)){
|
|
|
- List<String> keys = Arrays.asList("putUserId", "operUserId", "gsId", "customerServiceId");
|
|
|
|
|
|
|
+ List<String> keys = Arrays.asList("pitcherId", "operUserId", "gsId", "customerServiceId");
|
|
|
List<Long> userIds = new ArrayList<>();
|
|
List<Long> userIds = new ArrayList<>();
|
|
|
for (Map map : list) {
|
|
for (Map map : list) {
|
|
|
//把投手id和运营id和GSID和客服人员ID 转成List
|
|
//把投手id和运营id和GSID和客服人员ID 转成List
|
|
@@ -941,13 +941,11 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
}
|
|
}
|
|
|
//去重userIds
|
|
//去重userIds
|
|
|
userIds = userIds.stream().distinct().collect(Collectors.toList());
|
|
userIds = userIds.stream().distinct().collect(Collectors.toList());
|
|
|
- log.error("用户列表id：{}", JsonUtil.toString(userIds));
|
|
|
|
|
//发送RPC接口查询所有用户
|
|
//发送RPC接口查询所有用户
|
|
|
ResultVO<Map<Long, String>> userMap = sysUserRpc.getUserNameByIds(userIds);
|
|
ResultVO<Map<Long, String>> userMap = sysUserRpc.getUserNameByIds(userIds);
|
|
|
- log.error("用户列表：{}", JsonUtil.toString(userMap));
|
|
|
|
|
for (Map map : list) {
|
|
for (Map map : list) {
|
|
|
//投手名
|
|
//投手名
|
|
|
- updateUserName(map, "putUserId", "putUserName", userMap);
|
|
|
|
|
|
|
+ updateUserName(map, "pitcherId", "putUserName", userMap);
|
|
|
//运营人员名
|
|
//运营人员名
|
|
|
updateUserName(map, "operUserId", "operUserName", userMap);
|
|
updateUserName(map, "operUserId", "operUserName", userMap);
|
|
|
//GS人员名
|
|
//GS人员名
|
