From cc0155d91349cb062b47351d8604a8a319df290b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 6 Apr 2022 13:28:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=94=BE=E9=87=8D=E5=A4=8D=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=B3=A8=E8=A7=A3=E6=B7=BB=E5=8A=A0=EF=BC=8C=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=8E=A5=E5=8F=A3=E5=92=8C=E5=AE=A1=E6=A0=B8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/member/controller/ResiGroupMemberController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java index e1943d8920..7232c1e3aa 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java +++ b/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()); From 515363c3406ff83bea2e28602be3752da91361d1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 6 Apr 2022 17:38:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/model/ImportHouseInfoListener.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java index 58388cbd87..612f2c94cf 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java @@ -137,6 +137,16 @@ public class ImportHouseInfoListener extends AnalysisEventListener 15){ + nums.add(num); + disposeErrorMsg(info, "房主电话的长度超出限制"); + return; + } + if (data.getOwnerIdCard().length() > 18){ + nums.add(num); + disposeErrorMsg(info, "房主身份证的长度超出限制"); + return; + } /** * 2022-03-29 需求改动，单元号修改 eg 1 改为 1单元 * 做限制，此字段中必须带有 "单元"2字，不存在就不给导入 From 8383f41739ce805926d5b8eb177389d9ae063b5f Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 6 Apr 2022 17:58:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8A=A0=E5=BC=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/model/ImportHouseInfoListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java index 612f2c94cf..2e5e24879b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java @@ -137,12 +137,12 @@ public class ImportHouseInfoListener extends AnalysisEventListener 15){ + if (StringUtils.isNotBlank(data.getOwnerPhone()) && data.getOwnerPhone().length() > 15){ nums.add(num); disposeErrorMsg(info, "房主电话的长度超出限制"); return; } - if (data.getOwnerIdCard().length() > 18){ + if (StringUtils.isNotBlank(data.getOwnerIdCard()) && data.getOwnerIdCard().length() > 18){ nums.add(num); disposeErrorMsg(info, "房主身份证的长度超出限制"); return;