Merge remote-tracking branch 'origin/develop' into release_temp

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java

@@ -137,6 +137,16 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             disposeErrorMsg(info, "门牌号的值未填写");
             return;
         }
+        if (StringUtils.isNotBlank(data.getOwnerPhone()) && data.getOwnerPhone().length() > 15){
+            nums.add(num);
+            disposeErrorMsg(info, "房主电话的长度超出限制");
+            return;
+        }
+        if (StringUtils.isNotBlank(data.getOwnerIdCard()) && data.getOwnerIdCard().length() > 18){
+            nums.add(num);
+            disposeErrorMsg(info, "房主身份证的长度超出限制");
+            return;
+        }
         /**
          * 2022-03-29 需求改动，单元号修改 eg 1 改为 1单元
          * 做限制，此字段中必须带有 "单元"2字，不存在就不给导入

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java

@@ -18,6 +18,7 @@
 package com.epmet.modules.member.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -57,6 +58,7 @@ public class ResiGroupMemberController {
 	 * @Date 2020/3/29 20:01
 	 **/
 	@PostMapping("applyjoingroup")
+	@NoRepeatSubmit
 	public Result applyJoinGroup(@LoginUser TokenDto tokenDto,
                                  @RequestBody ApplyJoinGroupFormDTO applyJoinGroupFormDTO) {
 		applyJoinGroupFormDTO.setUserId(tokenDto.getUserId());
@@ -109,6 +111,7 @@ public class ResiGroupMemberController {
 	 * @Date 2020/3/30 22:07
 	 **/
 	@PostMapping("agreeapply")
+	@NoRepeatSubmit
 	public Result agreeApply(@LoginUser TokenDto tokenDto,
                              @RequestBody AgreeApplyFormDTO agreeApplyFormDTO) {
 		agreeApplyFormDTO.setUserId(tokenDto.getUserId());