From 22e8a676ee42c0d78b3526bcd9a635abbe8dca03 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 28 六月 2022 11:28:21 +0800
Subject: [PATCH] 优化databus bug
---
service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java b/service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java
index 63c6e41..09830ed 100755
--- a/service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java
+++ b/service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java
@@ -536,12 +536,12 @@
for (OwnerDto owner : ownerDtos) {
//瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
String idCard = owner.getIdCard();
- if (mark.size() == 0 && idCard != null && !idCard.equals("")) {
+ if (mark.size() == 0 && idCard != null && idCard.length() >= 16) {
idCard = idCard.substring(0, 6) + "**********" + idCard.substring(16);
}
//瀵逛笟涓绘墜鏈哄彿闅愯棌澶勭悊
String link = owner.getLink();
- if (mark.size() == 0 && link != null && !link.equals("")) {
+ if (mark.size() == 0 && link != null && link.length() == 11) {
link = link.substring(0, 3) + "****" + link.substring(7);
}
owner.setIdCard(idCard);
@@ -572,19 +572,12 @@
List<ContractDto> contractDtos = contractInnerServiceSMOImpl.queryContracts(contractDto);
Assert.listOnlyOne(contractDtos, "鏈壘鍒板悎鍚屼俊鎭�");
- RoomDto roomDto = new RoomDto();
- roomDto.setRoomId(contractDtos.get(0).getObjId());
- roomDto.setCommunityId(communityId);
-
- List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
- Assert.listOnlyOne(roomDtos, "鏈壘鍒版埧灞嬩俊鎭�");
-
OwnerDto ownerDto = new OwnerDto();
ownerDto.setCommunityId(communityId);
- ownerDto.setRoomId(roomDtos.get(0).getRoomId());
+ ownerDto.setMemberId(contractDtos.get(0).getObjId());
ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER);
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
- Assert.listOnlyOne(ownerDtos, "鏈壘鍒颁笟涓讳俊鎭�");
+ Assert.listOnlyOne(ownerDtos, "鏈壘鍒颁笟涓讳俊鎭垨鑰呮煡璇㈠埌澶氭潯锛岃鎹㈠叾浠栨潯浠舵煡璇�");
//鏌ヨ鏄惁鏈夎劚鏁忔潈闄�
List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
List<OwnerDto> ownerDtoList = new ArrayList<>();
@@ -603,11 +596,26 @@
owner.setLink(link);
ownerDtoList.add(owner);
}
-
OwnerDto resOwnerDto = ownerDtoList.get(0);
+ OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+ ownerRoomRelDto.setOwnerId(ownerDtoList.get(0).getOwnerId());
+ List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+ //娌℃湁鎴垮眿
+ if (ownerRoomRelDtos == null || ownerRoomRelDtos.size() < 1) {
+ return resOwnerDto;
+ }
+ List<String> roomIds = new ArrayList<>();
+ for (OwnerRoomRelDto tmpOwnerRoomRelDto : ownerRoomRelDtos) {
+ roomIds.add(tmpOwnerRoomRelDto.getRoomId());
+ }
+
+
+ RoomDto roomDto = new RoomDto();
+ roomDto.setRoomIds(roomIds.toArray(new String[roomIds.size()]));
+ roomDto.setCommunityId(communityId);
+ List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
resOwnerDto.setRooms(roomDtos);
-
return resOwnerDto;
}
--
Gitblit v1.8.0