From 411cf8971bd17c5025b3ab9d25f34c17361b5cff Mon Sep 17 00:00:00 2001
From: 曾成 <121184950@qq.com>
Date: 星期四, 14 五月 2020 11:40:58 +0800
Subject: [PATCH] 删除业主时增加判断是否有未解绑的房屋信息

---
 Api/src/main/java/com/java110/api/listener/owner/DeleteOwnerListener.java |   20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/Api/src/main/java/com/java110/api/listener/owner/DeleteOwnerListener.java b/Api/src/main/java/com/java110/api/listener/owner/DeleteOwnerListener.java
index a3f3372..a7f89a2 100644
--- a/Api/src/main/java/com/java110/api/listener/owner/DeleteOwnerListener.java
+++ b/Api/src/main/java/com/java110/api/listener/owner/DeleteOwnerListener.java
@@ -80,22 +80,14 @@
         if ("1001".equals(paramObj.getString("ownerTypeCd"))) {
             //ownerId 鍐欎负 memberId
             paramObj.put("ownerId", paramObj.getString("memberId"));
+            RoomDto roomDto = new RoomDto();
+            roomDto.setOwnerId((String) paramObj.get("ownerId"));
+            List<RoomDto> roomDtoList = roomInnerServiceSMOImpl.queryRoomsByOwner(roomDto);
+            if(roomDtoList.size() > 0){
+                throw new IllegalArgumentException("鍒犻櫎澶辫触,鍒犻櫎鍓嶈鍏堣В缁戞埧灞嬩俊鎭�");
+            }
             //灏忓尯妤兼坊鍔犲埌灏忓尯涓�
             businesses.add(ownerBMOImpl.exitCommunityMember(paramObj));
-        }
-        RoomDto roomDto = new RoomDto();
-        roomDto.setOwnerId((String) paramObj.get("ownerId"));
-        List<RoomDto> roomDtoList = roomInnerServiceSMOImpl.queryRoomsByOwner(roomDto);
-        //鍒ゆ柇鏀逛笟涓绘槸鍚︽湁鎴垮眿淇℃伅
-        if(roomDtoList.size() > 0){
-            //鍒犻櫎鎴垮眿鍏崇郴
-            businesses.add(ownerBMOImpl.deleteOwnerRoomRel(paramObj));
-            //鏇存柊鎴垮眿淇℃伅涓烘湭鍑哄敭
-            for(int i =0; i < roomDtoList.size(); i ++){
-                paramObj.put("state","2002");
-                paramObj.put("roomId",roomDtoList.get(i).getRoomId());
-                businesses.add(roomBMOImpl.updateShellRoom(paramObj, dataFlowContext));
-            }
         }
         ResponseEntity<String> responseEntity = ownerBMOImpl.callService(dataFlowContext, service.getServiceCode(), businesses);
 

--
Gitblit v1.8.0