From e60f89f66d9a1354c1776dec2bc085c51f62b923 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 26 二月 2020 23:03:50 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
StoreService/src/main/java/com/java110/store/smo/impl/ComplaintInnerServiceSMOImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 e945d2f..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));
--
Gitblit v1.8.0