|
|
@@ -88,10 +88,12 @@ public class HouseUserWrapper extends BaseEntityWrapper<HouseUser, HouseUserVO>
|
|
|
houseUserVO.setUnitName(unit.getName());
|
|
|
address.append("-").append(unit.getName());
|
|
|
}
|
|
|
- Floor floor = floorClient.getById(houseUser.getFloorId());
|
|
|
- if(floor != null){
|
|
|
- sb.append("|").append(floor.getName());
|
|
|
- houseUserVO.setFloorName(floor.getName());
|
|
|
+ if (null != houseUser.getFloorId()){
|
|
|
+ Floor floor = floorClient.getById(houseUser.getFloorId());
|
|
|
+ if(floor != null){
|
|
|
+ sb.append("|").append(floor.getName());
|
|
|
+ houseUserVO.setFloorName(floor.getName());
|
|
|
+ }
|
|
|
}
|
|
|
Room room = roomClient.getById(houseUser.getRoomId());
|
|
|
if(room != null){
|