From 50487791234ff79775ee7a6c74b35ee8d9bb90c8 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 12 九月 2024 15:00:02 +0800
Subject: [PATCH] 优化代码

---
 service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java |   23 ++++++++++++++++++++---
 1 files changed, 20 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 2968e04..1cdb772 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
@@ -29,6 +29,7 @@
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.ListUtil;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -165,7 +166,7 @@
         OwnerPo ownerPo = null;
 
         int flag = 0;
-        if (ownerDtos == null || ownerDtos.size() < 1) {
+        if (ListUtil.isNull(ownerDtos)) {
             ownerPo = new OwnerPo();
             ownerPo.setState(OwnerDto.STATE_FINISH);
             ownerPo.setOwnerFlag(OwnerDto.OWNER_FLAG_TRUE);
@@ -181,6 +182,10 @@
             ownerPo.setMemberId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId));
             ownerPo.setRemark("鎴夸骇瀵煎叆");
             ownerPo.setUserId(importOwnerRoomDto.getUserId());
+            ownerPo.setPersonType(importOwnerRoomDto.getPersonType());
+            ownerPo.setPersonRole(importOwnerRoomDto.getPersonRole());
+            ownerPo.setConcactPerson(importOwnerRoomDto.getConcactPerson());
+            ownerPo.setConcactLink(importOwnerRoomDto.getConcactLink());
             flag = ownerV1InnerServiceSMOImpl.saveOwner(ownerPo);
 
             if (flag < 1) {
@@ -202,6 +207,10 @@
             ownerPo.setMemberId(ownerDtos.get(0).getMemberId());
             ownerPo.setRemark("鎴夸骇瀵煎叆");
             ownerPo.setUserId(importOwnerRoomDto.getUserId());
+            ownerPo.setPersonType(importOwnerRoomDto.getPersonType());
+            ownerPo.setPersonRole(importOwnerRoomDto.getPersonRole());
+            ownerPo.setConcactPerson(importOwnerRoomDto.getConcactPerson());
+            ownerPo.setConcactLink(importOwnerRoomDto.getConcactLink());
             flag = ownerV1InnerServiceSMOImpl.updateOwner(ownerPo);
             if (flag < 1) {
                 throw new IllegalArgumentException("瀵煎叆涓氫富澶辫触");
@@ -225,7 +234,7 @@
         List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
         String ownerId = "";
         int flag = 0;
-        if (ownerDtos == null || ownerDtos.size() < 1) {
+        if (ListUtil.isNull(ownerDtos)) {
             ownerId = doSaveOwnerInfo(importOwnerRoomDto);
         } else {
             ownerId = ownerDtos.get(0).getOwnerId();
@@ -237,7 +246,7 @@
         ownerRoomRelDto.setRoomId(roomId);
         ownerRoomRelDto.setOwnerId(ownerId);
         List<OwnerRoomRelDto> roomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
-        if (roomRelDtos != null && roomRelDtos.size() > 0) {
+        if (!ListUtil.isNull(roomRelDtos)) {
             return;
         }
 
@@ -275,6 +284,10 @@
         ownerPo.setMemberId(ownerPo.getOwnerId());
         ownerPo.setRemark("鎴夸骇瀵煎叆");
         ownerPo.setUserId(importOwnerRoomDto.getUserId());
+        ownerPo.setPersonType(importOwnerRoomDto.getPersonType());
+        ownerPo.setPersonRole(importOwnerRoomDto.getPersonRole());
+        ownerPo.setConcactPerson(importOwnerRoomDto.getConcactPerson());
+        ownerPo.setConcactLink(importOwnerRoomDto.getConcactLink());
         flag = ownerV1InnerServiceSMOImpl.updateOwner(ownerPo);
         if (flag < 1) {
             throw new IllegalArgumentException("瀵煎叆涓氫富澶辫触");
@@ -298,6 +311,10 @@
         ownerPo.setMemberId(ownerPo.getOwnerId());
         ownerPo.setRemark("鎴夸骇瀵煎叆");
         ownerPo.setUserId(importOwnerRoomDto.getUserId());
+        ownerPo.setPersonType(importOwnerRoomDto.getPersonType());
+        ownerPo.setPersonRole(importOwnerRoomDto.getPersonRole());
+        ownerPo.setConcactPerson(importOwnerRoomDto.getConcactPerson());
+        ownerPo.setConcactLink(importOwnerRoomDto.getConcactLink());
         flag = ownerV1InnerServiceSMOImpl.saveOwner(ownerPo);
         if (flag < 1) {
             throw new IllegalArgumentException("瀵煎叆涓氫富澶辫触");

--
Gitblit v1.8.0