From e18a2e61164de7f320681ed00751263dec82a731 Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Tue, 31 Mar 2020 16:32:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiGroupMemberServiceImpl.java  | 15 +++++++++++++++
 .../mapper/member/ResiGroupMemberDao.xml          |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
index 2d274d18f4..f3d6f585a5 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
@@ -210,6 +210,13 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		int pageIndex = (groupMemberListFormDTO.getPageNo() - NumConstant.ONE) * groupMemberListFormDTO.getPageSize();
 		groupMemberListFormDTO.setPageNo(pageIndex);
 		List<GroupMemberListResultDTO> list = baseDao.selectListGroupMember(groupMemberListFormDTO);
+		if (null != list && list.size() > 0) {
+			for (GroupMemberListResultDTO groupMemberListResultDTO : list) {
+				groupMemberListResultDTO.setUserShowName("测试昵称");
+				groupMemberListResultDTO.setHeadPhoto("https://wx.qlogo.cn/mmopen/vi_32/PiajxSqBRaEIXGqhj0JakGnhk0L4x31XuWyQM4OxnriaKD4GuAgr8GdLpwu8jphH0oQPbPy0pepWU5iciaIeQwUJPg/132");
+
+			}
+		}
 		return new Result<List<GroupMemberListResultDTO>>().ok(list);
 	}
 
@@ -225,6 +232,12 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		int pageIndex = (applyingMemberFormDTO.getPageNo() - NumConstant.ONE) * applyingMemberFormDTO.getPageSize();
 		applyingMemberFormDTO.setPageNo(pageIndex);
 		List<ApplyingMemberResultDTO> list = baseDao.selectListApplyingMember(applyingMemberFormDTO);
+		if (null != list && list.size() > 0) {
+			for (ApplyingMemberResultDTO applyingMemberResultDTO : list) {
+				applyingMemberResultDTO.setApplyUserName("测试昵称");
+				applyingMemberResultDTO.setApplyUserHeadPhoto("https://wx.qlogo.cn/mmopen/vi_32/PiajxSqBRaEIXGqhj0JakGnhk0L4x31XuWyQM4OxnriaKD4GuAgr8GdLpwu8jphH0oQPbPy0pepWU5iciaIeQwUJPg/132");
+			}
+		}
 		return new Result<List<ApplyingMemberResultDTO>>().ok(list);
 	}
 
@@ -266,6 +279,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
                 groupMemeberOperationDTO.getCustomerUserId(),
 				agreeApplyFormDTO.getCustomerId());
 		baseDao.updateResiGroupStatistical(groupMemeberOperationDTO.getGroupId(), userRoleDTO);
+		//给用户发送消息 TODO
 		return new Result();
 	}
 
@@ -294,6 +308,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		groupMemeberOperationDTO.setUpdatedBy(disagreeApplyFormDTO.getUserId());
 		groupMemeberOperationDTO.setOperateUserId(disagreeApplyFormDTO.getUserId());
 		groupMemeberOperationService.update(groupMemeberOperationDTO);
+		//给用户发送消息 TODO
 		return new Result();
 	}
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
index 11c6f10481..b175972d81 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
@@ -83,7 +83,7 @@
     </select>
 
     <!-- 根据组id+用户id查询成员信息   -->
-    <select id="selectGroupMemberInfo"parameterType="map" resultType="com.epmet.resi.group.dto.member.ResiGroupMemberDTO">
+    <select id="selectGroupMemberInfo" parameterType="map" resultType="com.epmet.resi.group.dto.member.ResiGroupMemberDTO">
          SELECT
             rgm.*
         FROM