From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java b/service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java
index 28f7316..08b689c 100644
--- a/service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java
@@ -209,7 +209,6 @@
ownerPo.setRemark("鎴夸骇瀵煎叆");
ownerPo.setUserId(importOwnerRoomDto.getUserId());
flag = ownerV1InnerServiceSMOImpl.saveOwner(ownerPo);
-
if (flag < 1) {
throw new IllegalArgumentException("瀵煎叆涓氫富澶辫触");
}
@@ -251,7 +250,7 @@
ownerRoomRelPo.setUserId(importOwnerRoomDto.getUserId());
ownerRoomRelPo.setbId("-1");
ownerRoomRelPo.setRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
- ownerRoomRelPo.setState("2001");
+ ownerRoomRelPo.setState(importOwnerRoomDto.getRoomState());
ownerRoomRelPo.setRoomId(roomId);
ownerRoomRelPo.setOwnerId(ownerId);
ownerRoomRelPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B));
@@ -303,7 +302,7 @@
roomId = roomDtos.get(0).getRoomId();
if (OwnerDto.OWNER_TYPE_CD_OWNER.equals(importOwnerRoomDto.getOwnerTypeCd()) || StringUtil.isEmpty(importOwnerRoomDto.getOwnerName())) {
roomPo = new RoomPo();
- roomPo.setState(StringUtil.isEmpty(importOwnerRoomDto.getOwnerName()) ? RoomDto.STATE_FREE : RoomDto.STATE_SELL);
+ roomPo.setState(importOwnerRoomDto.getRoomState());
roomPo.setRoomId(roomId);
roomPo.setApartment(importOwnerRoomDto.getSection());
roomPo.setSection("1");
--
Gitblit v1.8.0