From a44b2221c91e96900ab1527b7a5811e47b9159c0 Mon Sep 17 00:00:00 2001 From: Paidax Date: Fri, 17 Oct 2025 14:37:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=9A=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/service/impl/MemberManageServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java index 57d22fca..e93ca2f9 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java @@ -527,11 +527,15 @@ public class MemberManageServiceImpl extends BaseServiceImpl implement if ("apply".equals(type)) { // 申请 MemberApplyRecord apply = dao().fetch(MemberApplyRecord.class, cnd); - businessNo = apply.getId(); + businessNo = Lang.isNotEmpty(apply) ? apply.getId() : ""; } else { // 变更 MemberChangeRecord change = dao().fetch(MemberChangeRecord.class, cnd); - businessNo = change.getId(); + businessNo = Lang.isNotEmpty(change) ? change.getId() : ""; + } + + if (StrUtil.isBlank(businessNo)) { + return; } int count = dao().count(ProcessInstance.class, Cnd.where("businessNo", "=", businessNo) From 0e1e632b98e65f3c9469045ab56773d12f45d8e6 Mon Sep 17 00:00:00 2001 From: Paidax Date: Fri, 17 Oct 2025 15:04:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E3=80=81=E6=89=8B=E6=9C=BA=E3=80=81?= =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/zhgh/staffmanage/member/apply/submit/index.html | 4 ++-- .../zhgh/staffmanage/member/change/common/memberChange.js | 4 ++-- .../platform/zhgh/staffmanage/member/change/submit/index.html | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html index 7289e97d..bf8db848 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html @@ -229,7 +229,7 @@ layout("/layouts/platform.html"){ sex: [{required: false, message: "必填", trigger: ["change", "blur"]}], isVoluntary: [{required: true, message: "必填", trigger: ["change", "blur"]}], sign: [{required: true, message: "必填", trigger: ["change", "blur"]}], - email: [ + /*email: [ { validator: (rule, value, callback) => { if (!value) { @@ -288,7 +288,7 @@ layout("/layouts/platform.html"){ }, trigger: ["change", "blur"] } - ] + ]*/ }, } }, diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js index d78b77b8..9414138b 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js @@ -283,7 +283,7 @@ const MEMBER_CHANGE = { formRules: { username: [{required: false, message: "必填", trigger: ["change", "blur"]}], sex: [{required: false, message: "必填", trigger: ["change", "blur"]}], - email: [ + /*email: [ { validator: (rule, value, callback) => { if (!value) { @@ -342,7 +342,7 @@ const MEMBER_CHANGE = { }, trigger: ["change", "blur"] } - ] + ]*/ }, welfareProjectList: [] diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html index 75b6aa92..10f5d0f0 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html @@ -299,7 +299,7 @@ layout("/layouts/platform.html"){ formRules: { username: [{required: false, message: "必填", trigger: ["change", "blur"]}], sex: [{required: false, message: "必填", trigger: ["change", "blur"]}], - email: [ + /*email: [ { validator: (rule, value, callback) => { if (!value) { @@ -358,7 +358,7 @@ layout("/layouts/platform.html"){ }, trigger: ["change", "blur"] } - ] + ]*/ }, } },