From 7aacf62c13f831693e4d1b944a113335e3b0bf74 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 11 Feb 2026 17:28:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=8A=A0=E7=9B=9F=E3=80=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/OrgAllInfoApiEntity.java | 4 ++++ .../orgapplyinfo/api/OrgApplyInfoApi.java | 19 +++++++------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfoApiEntity.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfoApiEntity.java index dbbbcf2..5ffc08d 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfoApiEntity.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfoApiEntity.java @@ -356,5 +356,9 @@ public class OrgAllInfoApiEntity implements Serializable { */ private java.lang.String handleBy; + /** + * 是否跳过重复校验 + */ + private String izSkipRepetVali; } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java index 4018dc9..66c1b83 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java @@ -36,13 +36,13 @@ public class OrgApplyInfoApi { } //验证入驻申请信息是否有变更 - if ("1".equals(orgApplyInfoApiEntity.getStatus()) && StringUtils.isNotBlank(orgApplyInfoApiEntity.getPkId())) { + if (!"Y".equals(orgApplyInfoApiEntity.getIzSkipRepetVali()) && "1".equals(orgApplyInfoApiEntity.getStatus()) && StringUtils.isNotBlank(orgApplyInfoApiEntity.getPkId())) { if (!orgApplyInfoApi.validateApplyChanged(orgApplyInfoApiEntity)) { return Result.error("未做变更"); } } //验证机构变更信息是否有变更 - if ("4".equals(orgApplyInfoApiEntity.getStatus())) { + if (!"Y".equals(orgApplyInfoApiEntity.getIzSkipRepetVali()) && "4".equals(orgApplyInfoApiEntity.getStatus())) { if (!orgApplyInfoApi.validateUpInfoChanged(orgApplyInfoApiEntity)) { return Result.error("未做变更"); } @@ -53,17 +53,12 @@ public class OrgApplyInfoApi { } System.out.println("-----------新增/编辑机构加盟申请信息--------tel------------" + orgApplyInfoApiEntity.getTel()); - if (StringUtils.isNotBlank(orgApplyInfoApiEntity.getId()) && !"rz".equals(orgApplyInfoApiEntity.getOptType())) { - orgApplyInfoApi.updateById(orgApplyInfoApiEntity); - return Result.ok("保存成功！"); + //入驻申请 + if ("1".equals(orgApplyInfoApiEntity.getStatus())) { + return Result.ok(orgApplyInfoApi.insertApply(orgApplyInfoApiEntity)); } else { - //入驻申请 - if ("1".equals(orgApplyInfoApiEntity.getStatus())) { - return Result.ok(orgApplyInfoApi.insertApply(orgApplyInfoApiEntity)); - } else { - //变更申请 - return Result.ok(orgApplyInfoApi.insertUpInfo(orgApplyInfoApiEntity)); - } + //变更申请 + return Result.ok(orgApplyInfoApi.insertUpInfo(orgApplyInfoApiEntity)); } }