From e23023b93f34286f5a807b0b85e9a0619a297ed7 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 21 二月 2023 23:25:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/cmd/visit/ListVisitsCmd.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/visit/ListVisitsCmd.java b/service-community/src/main/java/com/java110/community/cmd/visit/ListVisitsCmd.java
index 9bb730f..b7d0397 100644
--- a/service-community/src/main/java/com/java110/community/cmd/visit/ListVisitsCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/visit/ListVisitsCmd.java
@@ -19,6 +19,7 @@
import com.java110.intf.community.IVisitV1InnerServiceSMO;
import com.java110.intf.user.IOwnerV1InnerServiceSMO;
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -119,7 +120,7 @@
VisitDto visitDto = BeanConvertUtil.covertBean(reqJson, VisitDto.class);
if (reqJson.containsKey("channel") && !StringUtil.isEmpty(reqJson.getString("channel"))
&& "PC".equals(reqJson.getString("channel"))) {
- visitDto.setUserId("");
+ visitDto.setCreateUserId("");
}
int count = visitV1InnerServiceSMO.queryVisitsCount(visitDto);
List<ApiVisitDataVo> visits = new ArrayList<>();
@@ -175,10 +176,14 @@
for(ApiVisitDataVo apiVisitDataVo: visits){
for(OwnerDto tmpOwnerDto : ownerDtos){
+ if(StringUtil.isEmpty(apiVisitDataVo.getOwnerId())){
+ continue;
+ }
if(!apiVisitDataVo.getOwnerId().equals(tmpOwnerDto.getOwnerId())){
continue;
}
apiVisitDataVo.setOwnerName(tmpOwnerDto.getName());
+ apiVisitDataVo.setOwnerTel(tmpOwnerDto.getLink());
}
}
@@ -198,7 +203,7 @@
if(fileRelDtos == null || fileRelDtos.size() < 1){
return ;
}
- String imgUrl = MappingCache.getValue("IMG_PATH");
+ String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN,"IMG_PATH");
for(ApiVisitDataVo apiVisitDataVo: visits){
for(FileRelDto tmpFileRelDto : fileRelDtos){
if(!apiVisitDataVo.getvId().equals(tmpFileRelDto.getObjId())){
--
Gitblit v1.8.0