From c4ae7b33231e14975898bd57ced1f2d8a038beb9 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 8 Apr 2020 15:18:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E5=AE=A1=E6=A0=B8=E7=83=AD?=
 =?UTF-8?q?=E5=BF=83=E5=B1=85=E6=B0=91=E7=94=B3=E8=AF=B7=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiWarmheartedApplyServiceImpl.java         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
index a5765fa744..c8a7e3cbf5 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
@@ -193,9 +193,11 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
         baseDao.updateById(entity);
         //2:审核通过的添加热心居民的角色
         if(NumConstant.ONE_STR.equals(formDTO.getAuditStatus())){
+            //查询需要添加热心居民角色的userId
+            ResiWarmheartedApplyEntity resiWarmheartedApplyEntity = baseDao.selectById(formDTO.getResiWarmApplyId());
             UserRoleDTO dto = new UserRoleDTO();
             dto.setCustomerId(formDTO.getCustomerId());
-            dto.setUserId(formDTO.getUserId());
+            dto.setUserId(resiWarmheartedApplyEntity.getUserId());
             //所属端-居民端
             dto.setApp(AppClientConstant.APP_RESI);
             //角色-热心居民