Merge remote-tracking branch 'origin/main'

src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java

@@ -527,11 +527,15 @@ public class MemberManageServiceImpl extends BaseServiceImpl<Sys_user> 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)

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"]
 						}
-					]
+					]*/
 				},
 			}
 		},

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: []

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"]
 						}
-					]
+					]*/
 				},
 			}
 		},