Merge remote-tracking branch 'origin/main'

2025-10-17 15:11:38 +08:00
parent e8c050b685 0e1e632b98
commit e188075b3f
4 changed files with 12 additions and 8 deletions
@@ -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)