From c518d447ae377f9e41b76a613ae0237b014edf6d Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期三, 15 二月 2023 18:30:34 +0800
Subject: [PATCH] 合并解决冲突
---
service-community/src/main/java/com/java110/community/cmd/visit/ListVisitsCmd.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 a34973c..f5acc40 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;
@@ -179,6 +180,7 @@
continue;
}
apiVisitDataVo.setOwnerName(tmpOwnerDto.getName());
+ apiVisitDataVo.setOwnerTel(tmpOwnerDto.getLink());
}
}
@@ -198,7 +200,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