fix:bug
This commit is contained in:
1 parent
0a3da244ed
commit
f62693eb52
1 file changed
+16
-1
+16
-1
@@ -149,13 +149,20 @@ public class RecentServiceImpl implements RecentService {
|
|||||||
RecentPageResVo result = BeanUtil.toBean(recent, RecentPageResVo.class);
|
RecentPageResVo result = BeanUtil.toBean(recent, RecentPageResVo.class);
|
||||||
|
|
||||||
LocationDO currentUserLastLocation = locationService.getCurrentUserLastLocation();
|
LocationDO currentUserLastLocation = locationService.getCurrentUserLastLocation();
|
||||||
|
|
||||||
// 查询发送朋友圈用户
|
// 查询发送朋友圈用户
|
||||||
convertRecentPageResVoSetupMember(result, false);
|
convertRecentPageResVoSetupMember(result, false);
|
||||||
// 查询用户最新的位置
|
// 查询用户最新的位置
|
||||||
convertRecentPageResVoSetupLocation(result, currentUserLastLocation);
|
convertRecentPageResVoSetupLocation(result, currentUserLastLocation);
|
||||||
// 用户tag
|
// 用户tag
|
||||||
convertRecentPageResVoSetupTag(result);
|
convertRecentPageResVoSetupTag(result);
|
||||||
|
if (ObjectUtil.isNotEmpty(result.getUserOperationStatus())) {
|
||||||
|
Boolean isLookWechat = result.getUserOperationStatus().getIsLookWechat();
|
||||||
|
if (Boolean.TRUE.equals(isLookWechat)) {
|
||||||
|
result.getMember().setWechatNum(result.getMember().getWechatNum());
|
||||||
|
} else {
|
||||||
|
result.getMember().setWechatNum(result.getMember().getwechatMaskString());
|
||||||
|
}
|
||||||
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -587,6 +594,14 @@ public class RecentServiceImpl implements RecentService {
|
|||||||
if (ObjectUtil.isNotEmpty(operation)) {
|
if (ObjectUtil.isNotEmpty(operation)) {
|
||||||
result.setUserOperationStatus(operation);
|
result.setUserOperationStatus(operation);
|
||||||
}
|
}
|
||||||
|
if (ObjectUtil.isNotEmpty(result.getUserOperationStatus())) {
|
||||||
|
Boolean isLookWechat = result.getUserOperationStatus().getIsLookWechat();
|
||||||
|
if (Boolean.TRUE.equals(isLookWechat)) {
|
||||||
|
result.getMember().setWechatNum(result.getMember().getWechatNum());
|
||||||
|
} else {
|
||||||
|
result.getMember().setWechatNum(result.getMember().getwechatMaskString());
|
||||||
|
}
|
||||||
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user