From 4dbf61c9189796ec46d39ac4b839cfc064e70411 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 12 八月 2021 16:11:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/listener/fee/ListRoomsWhereFeeSetListener.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/fee/ListRoomsWhereFeeSetListener.java b/service-api/src/main/java/com/java110/api/listener/fee/ListRoomsWhereFeeSetListener.java
index 7bd5eae..5471cd8 100755
--- a/service-api/src/main/java/com/java110/api/listener/fee/ListRoomsWhereFeeSetListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/fee/ListRoomsWhereFeeSetListener.java
@@ -16,6 +16,7 @@
import com.java110.utils.constant.ServiceCodeFeeConfigConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.api.ApiRoomDataVo;
import com.java110.vo.api.ApiRoomVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -87,7 +88,9 @@
if (total > 0) {
List<RoomDto> roomDtoList = roomInnerServiceSMOImpl.queryRooms(roomDto);
String userId = context.getUserId();
- refreshRoomOwners(userId, reqJson.getString("communityId"), roomDtoList);
+ //鑾峰彇鎵嬫満鍙枫�佽韩浠借瘉鍙峰姞瀵嗘爣璇�
+ String flag = reqJson.getString("flag");
+ refreshRoomOwners(userId, reqJson.getString("communityId"), roomDtoList, flag);
apiRoomVo.setRooms(BeanConvertUtil.covertBeanList(roomDtoList, ApiRoomDataVo.class));
}
@@ -149,7 +152,6 @@
}
}
}
-
return roomDtos;
}
@@ -158,7 +160,7 @@
*
* @param roomDtos
*/
- private void refreshRoomOwners(String userId, String communityId, List<RoomDto> roomDtos) {
+ private void refreshRoomOwners(String userId, String communityId, List<RoomDto> roomDtos, String flag) {
List<String> roomIds = new ArrayList<>();
for (RoomDto roomDto : roomDtos) {
roomIds.add(roomDto.getRoomId());
@@ -175,12 +177,12 @@
roomDto.setOwnerName(tmpOwnerDto.getName());
//瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
String idCard = tmpOwnerDto.getIdCard();
- if (mark.size() == 0 && idCard != null && !idCard.equals("")) {
+ if (mark.size() == 0 && idCard != null && !idCard.equals("") && StringUtil.isEmpty(flag)) {
idCard = idCard.substring(0, 6) + "**********" + idCard.substring(16);
}
//瀵逛笟涓绘墜鏈哄彿闅愯棌澶勭悊
String link = tmpOwnerDto.getLink();
- if (mark.size() == 0 && link != null && !link.equals("")) {
+ if (mark.size() == 0 && link != null && !link.equals("") && StringUtil.isEmpty(flag)) {
link = link.substring(0, 3) + "****" + link.substring(7);
}
roomDto.setIdCard(idCard);
--
Gitblit v1.8.0