|
|
@ -40,6 +40,7 @@ import com.epmet.service.IcHouseService; |
|
|
|
import com.epmet.service.*; |
|
|
|
import com.epmet.util.ExcelPoiUtils; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
@ -238,19 +239,21 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { |
|
|
|
//IPage<Map<String, Object>> resultMap = searchHouse(buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, pageNo, pageSize);
|
|
|
|
|
|
|
|
// 查询pids
|
|
|
|
String pids = null; |
|
|
|
if (StringUtils.isNotBlank(ancestorAgencyId)) { |
|
|
|
CustomerAgencyDTO agency = agencyservice.getAgencyById(ancestorAgencyId); |
|
|
|
|
|
|
|
if (agency == null) { |
|
|
|
throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "【社区查询-查询房屋列表】查询当前staff所属组织信息失败"); |
|
|
|
} |
|
|
|
|
|
|
|
String pids; |
|
|
|
|
|
|
|
if(NumConstant.ZERO_STR.equals(agency.getPid())){ |
|
|
|
if (NumConstant.ZERO_STR.equals(agency.getPid())) { |
|
|
|
pids = ancestorAgencyId; |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
pids = agency.getPids().concat(StrConstant.COLON).concat(ancestorAgencyId); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
IPage<IcHouseEntity> page = new Page<IcHouseEntity>(pageNo,pageSize); |
|
|
|
|
|
|
|