소스 검색

已优化

java110 3 년 전
부모
커밋
d460618214
1개의 변경된 파일과 9개의 추가작업 그리고 2개의 파일을 삭제
  1. 9 2
      service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java

+ 9 - 2
service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java

@@ -523,14 +523,21 @@ public class ComprehensiveQueryImpl implements IComprehensiveQuery {
         roomDto.setCommunityId(communityId);
         roomDto.setCommunityId(communityId);
 
 
         List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
         List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
-        Assert.listOnlyOne(roomDtos, "未找到房屋信息");
+        //Assert.listOnlyOne(roomDtos, "未找到房屋信息");
+        if(roomDtos == null || roomDtos.size() < 1){
+            throw new IllegalArgumentException("未找到房屋信息");
+        }
 
 
         OwnerDto ownerDto = new OwnerDto();
         OwnerDto ownerDto = new OwnerDto();
         ownerDto.setCommunityId(communityId);
         ownerDto.setCommunityId(communityId);
         ownerDto.setRoomId(roomDtos.get(0).getRoomId());
         ownerDto.setRoomId(roomDtos.get(0).getRoomId());
         ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER);
         ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER);
         List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
         List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
-        Assert.listOnlyOne(ownerDtos, "未找到业主信息");
+        //Assert.listOnlyOne(ownerDtos, "未找到业主信息");
+        if(ownerDtos == null || ownerDtos.size() < 1){
+            throw new IllegalArgumentException("未找到业主信息");
+        }
+
         //查询是否有脱敏权限
         //查询是否有脱敏权限
         List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
         List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
         List<OwnerDto> ownerDtoList = new ArrayList<>();
         List<OwnerDto> ownerDtoList = new ArrayList<>();