From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/cmd/owner/ListAppUserBindingOwnersCmd.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/ListAppUserBindingOwnersCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/ListAppUserBindingOwnersCmd.java
index e411197..63f9c17 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/ListAppUserBindingOwnersCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/ListAppUserBindingOwnersCmd.java
@@ -8,12 +8,12 @@
import com.java110.dto.community.CommunityDto;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.owner.OwnerAppUserDto;
-import com.java110.dto.workflowDataFile.WorkflowDataFileDto;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
@@ -59,6 +59,11 @@
reqJson.put("userId", headers.get("userid"));
}
+ //鏍规嵁 openId 鏌ヨ鐨�
+ if(reqJson.containsKey("openId") && !StringUtil.isEmpty(reqJson.getString("openId"))){
+ reqJson.put("userId", "");
+ }
+
OwnerAppUserDto ownerAppUserDto = BeanConvertUtil.covertBean(reqJson, OwnerAppUserDto.class);
@@ -97,12 +102,16 @@
ownerAppUserDto.setAreaName(tmpCommunityDto.getAreaName());
ownerAppUserDto.setParentAreaCode(tmpCommunityDto.getParentAreaCode());
ownerAppUserDto.setParentAreaName(tmpCommunityDto.getParentAreaName());
+ ownerAppUserDto.setCommunityQrCode(tmpCommunityDto.getQrCode());
}
}
}
List<String> ownerIds = new ArrayList<>();
for(OwnerAppUserDto ownerAppUserDto : ownerAppUserDtos){
+ if(StringUtil.isEmpty(ownerAppUserDto.getMemberId()) || "-1".equals(ownerAppUserDto.getMemberId())){
+ continue;
+ }
ownerIds.add(ownerAppUserDto.getMemberId());
}
@@ -118,13 +127,13 @@
if(fileRelDtos == null || fileRelDtos.size() < 1){
return ;
}
- String imgUrl = MappingCache.getValue("IMG_PATH");
+ String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN,"IMG_PATH");
for(OwnerAppUserDto ownerAppUserDto : ownerAppUserDtos){
for(FileRelDto tmpFileRelDto : fileRelDtos){
if(!ownerAppUserDto.getMemberId().equals(tmpFileRelDto.getObjId())){
continue;
}
- ownerAppUserDto.setHeadImgUrl(imgUrl +tmpFileRelDto.getFileRealName() );
+ ownerAppUserDto.setHeadImgUrl(imgUrl +tmpFileRelDto.getFileSaveName() );
}
}
}
--
Gitblit v1.8.0