Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java

@@ -8,6 +8,8 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -89,6 +91,9 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
     public IcHouseDTO get(String id) {
         IcHouseEntity entity = baseDao.selectById(id);
         IcHouseDTO dto = ConvertUtils.sourceToTarget(entity, IcHouseDTO.class);
+        if (null == dto) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), String.format("houseId:%s已删除", id), "房屋已删除");
+        }
         dto.setHouseTypeName(HouseTypeEnums.getTypeValue(dto.getHouseType()));
         dto.setRentName(HouseRentFlagEnums.getTypeValue(dto.getRentFlag()));
         dto.setPurposeName(HousePurposeEnums.getTypeValue(dto.getPurpose()));