8003：组名已存在，8201：请完善居民信息

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -9,8 +9,7 @@ public enum EpmetErrorCode {
 	SERVER_ERROR(8000, "服务器开小差了..."),
 	CANNOT_JOIN_GROUP(8001, "只有认证党员和居民才可以加入小组，请选择您的身份"),
 	CANNOT_CREATE_GROUP(8002, "只有党员和热心居民才能创建小组，请选择您的身份"),
-	GROUP_ALREADY_EXISTED(8003,"您的组名已存在，请重新修改"),
-	ALREADY_APPLIED_GROUP(8004,"该群已申请过，请耐心等待审核"),
+	GROUP_ALREADY_EXISTED(8003,"组名已存在"),
 	LOSE_EFFICACY(8006,"此邀请链接已过期"),
 
 	MOBILE_HAS_BEEN_USED(8101, "该手机号已注册，请更换手机号或使用原绑定的微信账号登录"),
@@ -19,7 +18,7 @@ public enum EpmetErrorCode {
 	MOBILE_GET_CODE_ERROR(8104,"获取验证码失败"),
 	MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"),
 
-    CANNOT_AUDIT_WARM(8201, "未注册居民不能申请热心居民，请先完善居民注册。");
+    CANNOT_AUDIT_WARM(8201, "请完善居民信息");
 
 
 	private int code;

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@@ -206,7 +206,8 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		//查看用户最新一条成员处理记录，避免重复申请
 		GroupMemeberOperationDTO groupMember = baseDao.selectGroupMemberOperationLatest(applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId());
 		if(null!=groupMember&&MemberStateConstant.UNDER_AUDITTING.equals(groupMember.getOperateStatus())){
-			return new Result().error(EpmetErrorCode.ALREADY_APPLIED_GROUP.getCode());
+			logger.error(ModuleConstant.ALREADY_APPLIED_GROUP);
+			throw new RenException(ModuleConstant.ALREADY_APPLIED_GROUP);
 		}
 		if(null!=groupMember&&MemberStateConstant.APPROVED.equals(groupMember.getOperateStatus())){
 			logger.error(ModuleConstant.ALREADY_IN_GROUP);

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java

@@ -173,4 +173,9 @@ public interface ModuleConstant extends Constant {
 	 * 减号
 	 * */
 	String MINUS_OPERATION = "-";
+
+	/**
+	 * 避免重复加入群
+	 * */
+	String ALREADY_APPLIED_GROUP="该群已申请过，请耐心等待审核";
 }