From 42adfdfb1866101eab568d85d96fcee6f89e70ef Mon Sep 17 00:00:00 2001
From: 15178832520 <121184950@qq.com>
Date: 星期六, 16 五月 2020 17:06:32 +0800
Subject: [PATCH] 增加小程序配置

---
 StoreService/src/main/java/com/java110/store/smo/impl/ComplaintInnerServiceSMOImpl.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/StoreService/src/main/java/com/java110/store/smo/impl/ComplaintInnerServiceSMOImpl.java b/StoreService/src/main/java/com/java110/store/smo/impl/ComplaintInnerServiceSMOImpl.java
index e98f0f0..20a48d9 100644
--- a/StoreService/src/main/java/com/java110/store/smo/impl/ComplaintInnerServiceSMOImpl.java
+++ b/StoreService/src/main/java/com/java110/store/smo/impl/ComplaintInnerServiceSMOImpl.java
@@ -5,10 +5,8 @@
 import com.java110.core.smo.complaint.IComplaintInnerServiceSMO;
 import com.java110.core.smo.room.IRoomInnerServiceSMO;
 import com.java110.core.smo.user.IUserInnerServiceSMO;
-import com.java110.dto.FeeDto;
 import com.java110.dto.PageDto;
 import com.java110.dto.RoomDto;
-import com.java110.dto.UserDto;
 import com.java110.dto.complaint.ComplaintDto;
 import com.java110.store.dao.IComplaintServiceDao;
 import com.java110.utils.util.BeanConvertUtil;
@@ -51,6 +49,11 @@
         }
 
         List<ComplaintDto> complaints = BeanConvertUtil.covertBeanList(complaintServiceDaoImpl.getComplaintInfo(BeanConvertUtil.beanCovertMap(complaintDto)), ComplaintDto.class);
+
+        if(complaints == null || complaints.size() == 0){
+            return complaints;
+        }
+
         RoomDto roomDto = new RoomDto();
         roomDto.setCommunityId(complaintDto.getCommunityId());
         roomDto.setRoomIds(getRoomIds(complaints));
@@ -72,7 +75,10 @@
     private void refreshRoomInfo(ComplaintDto complainDto, List<RoomDto> roomDtos) {
         for (RoomDto room : roomDtos) {
             if (room.getRoomId().equals(complainDto.getRoomId())) {
-                BeanConvertUtil.covertBean(room, complainDto);
+                //BeanConvertUtil.covertBean(room, complainDto);
+                complainDto.setFloorNum(room.getFloorNum());
+                complainDto.setRoomNum(room.getRoomNum());
+                complainDto.setUnitNum(room.getUnitNum());
             }
         }
     }

--
Gitblit v1.8.0