优化代码

wuxw

2024-02-21 a7ab180711bb95eceff4763a7fcb09c7f0d36f2e

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

@@ -1,7 +1,7 @@
package com.java110.user.bmo.owner.impl;

import com.java110.dto.RoomDto;
import com.java110.dto.basePrivilege.BasePrivilegeDto;
import com.java110.dto.room.RoomDto;
import com.java110.dto.privilege.BasePrivilegeDto;
import com.java110.dto.contract.ContractDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.owner.OwnerDto;
@@ -450,7 +450,7 @@
            throw new IllegalArgumentException("查询内容格式错误，请输入 楼栋-商铺 如 1-1");
        }

        String[] values = searchValue.split("-");
        String[] values = searchValue.split("-",3);

        if (values.length != 2) {
            throw new IllegalArgumentException("查询内容格式错误，请输入 楼栋-商铺 如 1-1");
@@ -523,14 +523,21 @@
        roomDto.setCommunityId(communityId);

        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.setCommunityId(communityId);
        ownerDto.setRoomId(roomDtos.get(0).getRoomId());
        ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER);
        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<OwnerDto> ownerDtoList = new ArrayList<>();