From 63cafbb86b8475b5619d17d27e096cb6ae2f294a Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 26 Nov 2020 16:35:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=80=E8=AF=B7=E5=85=A5=E7=BB=84=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E8=B0=83=E6=95=B4=E5=85=BC=E5=AE=B9=E6=97=A7=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/exception/EpmetErrorCode.java       |  3 ++-
 .../impl/GroupInvitationServiceImpl.java      | 24 ++++++++++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index 10533e98fd..550a78de43 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -128,7 +128,8 @@ public enum EpmetErrorCode {
 	GROUP_EDIT_ERROR(9000,"组信息编辑失败"),
 	GROUP_NOT_EXISTS(9001,"该组不存在"),
 	GROUP_IN_AUDITING(9002,"该组已提交编辑，处于待审核状态，完成审核前不可再次提交"),
-	GROUP_EDIT_NUM_LIMITED(9003,"已达编辑次数上限");
+	GROUP_EDIT_NUM_LIMITED(9003,"已达编辑次数上限"),
+	EXISTING_APPLICATION(9004,"已存在待审核入组申请，不能重复申请");
 
 
 	private int code;
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 4196c164bf..2dd23728e4 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
@@ -358,6 +358,14 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 			logger.info("已经在群内,直接返回成功");
 			return;
 		}
+		//2020.11.26 sun start
+		//先判断用户是否有在审核的入组申请，有的话直接给提示
+		GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.selectLatestRecord(groupInvitationDTO.getResiGroupId(), formDTO.getUserId());
+		if (null != groupMemeberOperationDTO && MemberStateConstant.UNDER_AUDITTING.equals(groupMemeberOperationDTO.getOperateStatus())) {
+			logger.info("已存在待审核入组申请，不能重复审核");
+			throw new RenException(EpmetErrorCode.EXISTING_APPLICATION.getCode());
+		}
+		//end
 		//3、进入小组所在的网格
 		ResiGroupDTO resiGroupDTO = resiGroupService.get(groupInvitationDTO.getResiGroupId());
 		if(null==resiGroupDTO){
@@ -389,14 +397,18 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		groupMemeberOperation.setGroupInvitationId(formDTO.getInvitationId());
 		groupMemeberOperation.setOperateUserId(formDTO.getUserId());
 		//邀请入组
-		if(groupInvitationDTO.getInvitationType().equals(GroupStateConstant.GROUP_INVITED)){
+		if (StringUtils.isNotBlank(groupInvitationDTO.getInvitationType())) {
+			if (groupInvitationDTO.getInvitationType().equals(GroupStateConstant.GROUP_INVITED)) {
+				groupMemeberOperation.setOperateDes(UserMessageConstant.INVITED_OPERATE);
+				//扫码入组
+			} else if (groupInvitationDTO.getInvitationType().equals(GroupStateConstant.GROUP_SCANCODE)) {
+				groupMemeberOperation.setOperateDes(UserMessageConstant.SCANCODE_OPERATE);
+			}
+		} else {//兼容旧程序
 			groupMemeberOperation.setOperateDes(UserMessageConstant.INVITED_OPERATE);
-			//扫码入组
-		}else if(groupInvitationDTO.getInvitationType().equals(GroupStateConstant.GROUP_SCANCODE)){
-			groupMemeberOperation.setOperateDes(UserMessageConstant.SCANCODE_OPERATE);
 		}
 		//入组审核开关是开启状态则需要组长审核
-		if(GroupStateConstant.AUDIT_SWITCH_OPEN.equals(resiGroupDTO.getAuditSwitch())){
+		if (StringUtils.isNotBlank(resiGroupDTO.getAuditSwitch()) && GroupStateConstant.AUDIT_SWITCH_OPEN.equals(resiGroupDTO.getAuditSwitch())) {
 			groupMemeberOperation.setOperateStatus(MemberStateConstant.UNDER_AUDITTING);
 			//新增一条入组申请
 			groupMemeberOperationService.accetInvitation(groupMemeberOperation);
@@ -404,7 +416,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 			resiGroupMemberServiceImpl.sendMessageToGroupLeader(resiGroupDTO, formDTO.getUserId());
 			return;
 		}
-		UserRoleDTO userRoleDTO=this.getUserRoleDTO(result.getData().getUserRoleList());
+		UserRoleDTO userRoleDTO = this.getUserRoleDTO(result.getData().getUserRoleList());
 		//5、新增一条邀请入群、直接审核通过的入群记录
 		groupMemeberOperation.setOperateStatus(MemberStateConstant.APPROVED);
 		//2020.11.17  end