diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/InitApplyCreatedGroupFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/InitApplyCreatedGroupFormDTO.java
index 92b65101cd..263c46f286 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/InitApplyCreatedGroupFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/InitApplyCreatedGroupFormDTO.java
@@ -16,6 +16,9 @@ public class InitApplyCreatedGroupFormDTO implements Serializable {
 	@NotBlank(message = "客户id不能为空")
 	private String customerId;
 
+	@NotBlank(message = "当前网格id为空")
+	private String gridId;
+
 	/**
 	 * 用户id TokenDto赋值
 	 */
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
index 329158b9af..39bac55512 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
@@ -198,9 +198,10 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @param app
 	 * @param userId
 	 * @param customerId
+	 * @param gridId
 	 * @Author yinzuomei
 	 * @Description 判断用户当前角色
 	 * @Date 2020/4/1 0:00
 	 **/
-	UserRoleDTO checkPartyMemberOrWarmHeated(String app, String userId, String customerId);
+	UserRoleDTO checkPartyMemberOrWarmHeated(String app, String userId, String customerId, String gridId);
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index ee936b3911..1ea9ea65b4 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -328,7 +328,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		//6、群初始统计记录
 		UserRoleDTO userRoleDTO = this.checkPartyMemberOrWarmHeated(applyCreateGroupFormDTO.getApp(),
 									applyCreateGroupFormDTO.getUserId(),
-									applyCreateGroupFormDTO.getCustomerId());
+									applyCreateGroupFormDTO.getCustomerId(),
+									applyCreateGroupFormDTO.getGridId());
 		ResiGroupStatisticalDTO resiGroupStatisticalDTO=new ResiGroupStatisticalDTO();
 		resiGroupStatisticalDTO.setResiGroupId(resiGroupEntity.getId());
 		resiGroupStatisticalDTO.setTotalMembers(NumConstant.ONE);
@@ -416,7 +417,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		}
 		UserRoleDTO userRoleDTO = this.checkPartyMemberOrWarmHeated(initApplyCreatedGroupFormDTO.getApp(),
 				initApplyCreatedGroupFormDTO.getUserId(),
-				initApplyCreatedGroupFormDTO.getCustomerId());
+				initApplyCreatedGroupFormDTO.getCustomerId(),
+				initApplyCreatedGroupFormDTO.getGridId());
 		if (!NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag()) && !NumConstant.ONE_STR.equals(userRoleDTO.getWarmHeartedFlag())) {
 			return new Result().error(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode(),EpmetErrorCode.CANNOT_CREATE_GROUP.getMsg());
 		}
@@ -490,18 +492,20 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 * @param app
 	 * @param userId
 	 * @param customerId
+	 * @param gridId
 	 * @return boolean
 	 * @Author yinzuomei
 	 * @Description 用户拥有党员或者热心居民标签返回true, 没有权限返回false
 	 * @Date 2020/3/30 16:33
 	 **/
 	@Override
-	public UserRoleDTO checkPartyMemberOrWarmHeated(String app, String userId, String customerId) {
+	public UserRoleDTO checkPartyMemberOrWarmHeated(String app, String userId, String customerId, String gridId) {
 		UserRoleDTO userRoleDTO = new UserRoleDTO();
 		UserRoleFormDTO userRoleFormDTO = new UserRoleFormDTO();
 		userRoleFormDTO.setApp(app);
 		userRoleFormDTO.setCustomerId(customerId);
 		userRoleFormDTO.setUserId(userId);
+		userRoleFormDTO.setGridId(gridId);
 		Result<List<UserRoleResultDTO>> userRoleListResult = epmetUserFeignClient.getUserRoleInfo(userRoleFormDTO);
 		if (!userRoleListResult.success()) {
 			logger.info("获取用户角色feign调用失败" + userRoleListResult.getMsg());
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
index c2e0b5a842..81c857b950 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
@@ -309,10 +309,13 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		GroupInvitationDTO groupInvitationDTO=validResult.getData();
 		//2、校验是否已经注册居民
 		ResiGroupDTO resiGroupDTO = resiGroupService.get(groupInvitationDTO.getResiGroupId());
+		UserRoleDTO userRoleDTO=new UserRoleDTO();
 		if (null != resiGroupDTO) {
-			UserRoleDTO userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(formDTO.getApp(),
+			//获取当前用户所有角色
+			 userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(formDTO.getApp(),
 					formDTO.getUserId(),
-					resiGroupDTO.getCustomerId());
+					resiGroupDTO.getCustomerId(),
+					resiGroupDTO.getGridId());
 			if (NumConstant.ZERO_STR.equals(userRoleDTO.getRegisteredResiFlag())) {
 				return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(), EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg());
 			}
@@ -324,7 +327,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		groupMemeberOperation.setOperateStatus(MemberStateConstant.APPROVED);
 		groupMemeberOperation.setEnterGroupType(EnterGroupTypeConstant.INVITED);
 		groupMemeberOperation.setOperateUserId(formDTO.getUserId());
-		groupMemeberOperationService.save(groupMemeberOperation);
+		groupMemeberOperationService.accetInvitation(groupMemeberOperation);
 		//4、直接加入群成员关系表
 		//如果是之前被移除的，则修改resi_group_member记录
 		ResiGroupMemberDTO resiGroupMemberDTO = new ResiGroupMemberDTO();
@@ -340,9 +343,6 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		resiGroupMemberDTO.setCreatedBy(groupMemeberOperation.getCustomerUserId());
 		resiGroupMemberService.saveOrUpdate(resiGroupMemberDTO);
 		//5、修改群统计值
-		UserRoleDTO userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(formDTO.getApp(),
-				formDTO.getUserId(),
-				resiGroupDTO.getCustomerId());
 		resiGroupMemberDao.updateResiGroupStatistical(groupMemeberOperation.getGroupId(), userRoleDTO);
 		//6、发送消息
 		this.sendMessageToLeader(formDTO, resiGroupDTO,groupInvitationDTO);
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/GroupMemeberOperationService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/GroupMemeberOperationService.java
index c60c5ac37a..ac04cf0742 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/GroupMemeberOperationService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/GroupMemeberOperationService.java
@@ -116,4 +116,10 @@ public interface GroupMemeberOperationService extends BaseService<GroupMemeberOp
      * @Date 2020/4/11 10:41
      **/
     GroupMemeberOperationDTO selectLatestRecord(String groupId, String userId);
+
+    /**
+     * 用户通过邀请入群时，如果存在有效的申请，直接置为已通过
+     * @param groupMemeberOperation
+     */
+    void accetInvitation(GroupMemeberOperationDTO groupMemeberOperation);
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
index 6334f656d6..c47c24260f 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
@@ -132,4 +132,15 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
         return baseDao.selectLatestRecord(groupId,userId);
     }
 
+    @Override
+    public void accetInvitation(GroupMemeberOperationDTO groupMemeberOperation) {
+        //如果用户存在待审核的入群申请，将申请置为已通过
+        GroupMemeberOperationDTO groupMemeberOperationDTO = this.selectLatestRecord(groupMemeberOperation.getGroupId(), groupMemeberOperation.getCustomerUserId());
+        if (null != groupMemeberOperationDTO && MemberStateConstant.UNDER_AUDITTING.equals(groupMemeberOperationDTO.getOperateStatus())) {
+            groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.APPROVED);
+            this.update(groupMemeberOperationDTO);
+        }
+        this.save(groupMemeberOperation);
+    }
+
 }
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 5d0f40f834..d2740212e9 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
@@ -184,7 +184,8 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		if (null != resiGroupDTO) {
 			UserRoleDTO userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(applyJoinGroupFormDTO.getApp(),
 					applyJoinGroupFormDTO.getUserId(),
-					resiGroupDTO.getCustomerId());
+					resiGroupDTO.getCustomerId(),
+					resiGroupDTO.getGridId());
 			if (NumConstant.ZERO_STR.equals(userRoleDTO.getRegisteredResiFlag())) {
 				return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg());
 			}
@@ -321,9 +322,11 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		resiGroupMemberDTO.setCreatedBy(groupMemeberOperationDTO.getCustomerUserId());
 		resiGroupMemberService.saveOrUpdate(resiGroupMemberDTO);
 		//5、修改群统计值
+		ResiGroupDTO resiGroupDTO=resiGroupService.get(groupMemeberOperationDTO.getGroupId());
 		UserRoleDTO userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(agreeApplyFormDTO.getApp(),
                 groupMemeberOperationDTO.getCustomerUserId(),
-				agreeApplyFormDTO.getCustomerId());
+				agreeApplyFormDTO.getCustomerId(),
+				resiGroupDTO.getGridId());
 		baseDao.updateResiGroupStatistical(groupMemeberOperationDTO.getGroupId(), userRoleDTO);
 		//6、给用户发送消息
 		this.sendUserApprovedMessage(resiGroupMemberDTO);
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserRoleFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserRoleFormDTO.java
index 75340b75c5..2179f12b3e 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserRoleFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserRoleFormDTO.java
@@ -6,7 +6,7 @@ import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
- * @Description
+ * @Description 查询用户在当前网格下拥有的角色信息，入参DTO
  * @ClassName UserRoleFormDTO
  * @Author wangc
  * @date 2020.03.30 15:26
@@ -22,6 +22,9 @@ public class UserRoleFormDTO implements Serializable{
     @NotBlank(message = "客户Id不能为空")
     private String customerId;
 
+    @NotBlank(message = "网格id不能为空")
+    private String gridId;
+
     @NotBlank(message = "用户来源app不能为空")
     private String app;
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
index 790793dd10..233807ba86 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
@@ -242,6 +242,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         UserRoleFormDTO userRoleFormDTO = new UserRoleFormDTO();
         userRoleFormDTO.setUserId(enterGridFormDTO.getUserId());
         userRoleFormDTO.setCustomerId(enterGridFormDTO.getCustomerId());
+        userRoleFormDTO.setGridId(enterGridFormDTO.getGridId());
         List<UserRoleResultDTO> roleList =  userRoleDao.getUserRoleInfo(userRoleFormDTO);
         List<String> roleListString = new ArrayList<>();
         for(UserRoleResultDTO role : roleList){
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml
index e33db2134f..c41c2685f2 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml
@@ -41,6 +41,14 @@
                 AND
                 ur.CUSTOMER_ID = #{customerId}
             </if>
+            <if test='null != gridId and "" != gridId'>
+                AND
+                ( ur.GRID_ID = #{gridId} OR ur.GRID_ID = 'all' )
+            </if>
+            <if test='null == gridId or "" == gridId'>
+                AND
+                ur.GRID_ID = 'all'
+            </if>
         </where>
 
     </select>