From 15874b09f759e010c8968f60743d21b7f86c7d0e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 26 May 2021 13:58:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=84=8F=E5=BB=BA=E7=BB=84=EF=BC=8C?=
 =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88bugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiGroupServiceImpl.java    | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

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 2c73841cbc..5616ddb4b3 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
@@ -598,22 +598,35 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	public Result agreeApplyGroup(AgreeApplyGroupFormDTO agreeApplyGroupFormDTO) {
 		//1、更新组的状态
 		ResiGroupDTO resiGroupDTO = this.get(agreeApplyGroupFormDTO.getGroupId());
+		if (null == resiGroupDTO) {
+			throw new RenException("小组信息不存在");
+		}
+		if (GroupStateConstant.GROUP_APPROVED.equals(resiGroupDTO.getState())) {
+			logger.warn("当前小组已审核通过,groupId=" + agreeApplyGroupFormDTO.getGroupId());
+			return new Result();
+		}
 		resiGroupDTO.setState(GroupStateConstant.GROUP_APPROVED);
 		this.update(resiGroupDTO);
 		//2、更新组的申请记录改为已通过
 		ResiGroupOperationDTO resiGroupOperation = resiGroupOperationDao.selectGroupApplyRecord(agreeApplyGroupFormDTO.getGroupId());
-		resiGroupOperation.setState(GroupStateConstant.GROUP_APPROVED);
-		resiGroupOperation.setOperateUserId(agreeApplyGroupFormDTO.getUserId());
-		resiGroupOperationService.update(resiGroupOperation);
+		if (null != resiGroupOperation) {
+			resiGroupOperation.setState(GroupStateConstant.GROUP_APPROVED);
+			resiGroupOperation.setOperateUserId(agreeApplyGroupFormDTO.getUserId());
+			resiGroupOperationService.update(resiGroupOperation);
+		}
 		//3、将群主在群成员的状态改为已通过
 		ResiGroupMemberDTO resiGroupMemberDTO = resiGroupMemberDao.selectLeaderMember(agreeApplyGroupFormDTO.getGroupId());
-		resiGroupMemberDTO.setStatus(MemberStateConstant.APPROVED);
-		resiGroupMemberService.update(resiGroupMemberDTO);
+		if (null != resiGroupMemberDTO) {
+			resiGroupMemberDTO.setStatus(MemberStateConstant.APPROVED);
+			resiGroupMemberService.update(resiGroupMemberDTO);
+		}
 		//4、更新群主的出入群记录改为已通过
 		GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationDao.selectLeaderRecord(agreeApplyGroupFormDTO.getGroupId());
-		groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.APPROVED);
-		groupMemeberOperationDTO.setOperateUserId(agreeApplyGroupFormDTO.getUserId());
-		groupMemeberOperationService.update(groupMemeberOperationDTO);
+		if (null != groupMemeberOperationDTO) {
+			groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.APPROVED);
+			groupMemeberOperationDTO.setOperateUserId(agreeApplyGroupFormDTO.getUserId());
+			groupMemeberOperationService.update(groupMemeberOperationDTO);
+		}
 		//4-1.2020.11.17 sun  添加小组审核通过后生成小组的二维码图片逻辑 start
 		TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
 			@Override