From 023597f49130463a0c292b34a3c90546684895bc Mon Sep 17 00:00:00 2001
From: wsm <2746563060@qq.com>
Date: Fri, 7 Aug 2026 09:55:33 +0800
Subject: [PATCH] =?UTF-8?q?fix(fixcontact):=20=E4=BF=AE=E5=A4=8D=20E2E=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8F=91=E7=8E=B0=E7=9A=84=205=20=E9=A1=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- add 默认 bpm_status 设为未发起(1)，并校验表单编号/定点联系所领导/主办部门/申请人必填
- delete 校验记录存在，不存在返回未找到
- processComplete 驳回分支空 rejectNode 抛出明确错误替代 NPE
- FixContactConstant.BUSINESS_KEY 修正为 business_id，与流程 Bean 读取一致
---
 .../process/service/impl/ExtActTaskCcServiceImpl.java |  3 +++
 .../fixcontact/constant/FixContactConstant.java       |  4 ++--
 .../controller/FixedContact20260730Controller.java    | 11 +++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/service/impl/ExtActTaskCcServiceImpl.java b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/service/impl/ExtActTaskCcServiceImpl.java
index eb67684..226b835 100644
--- a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/service/impl/ExtActTaskCcServiceImpl.java
+++ b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/service/impl/ExtActTaskCcServiceImpl.java
@@ -184,6 +184,9 @@ public class ExtActTaskCcServiceImpl extends ServiceImpl<ExtActTaskCcMapper, Ext
                 taskService.complete(taskId, varmap);
             }else{
                 //驳回到历史节点
+                if (oConvertUtils.isEmpty(rejectNode)) {
+                    throw new BpmException("驳回操作未指定目标节点，请选择要驳回到的节点");
+                }
                 rejectDescription = this.backToStepTask(processInstanceId, rejectNode, task, nextUser);
             }
 
diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/constant/FixContactConstant.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/constant/FixContactConstant.java
index 73d8d84..1fd5715 100644
--- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/constant/FixContactConstant.java
+++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/constant/FixContactConstant.java
@@ -28,8 +28,8 @@ public final class FixContactConstant {
 
     /** 流程变量名 */
     public static final class FlowVarName {
-        /** 业务表单ID */
-        public static final String BUSINESS_KEY = "businessKey";
+        /** 业务表单ID（与流程 Bean getFixedContact 读取的 business_id 保持一致） */
+        public static final String BUSINESS_KEY = "business_id";
         /** 子流程当前部门ID（多实例局部变量） */
         public static final String IMPL_DEPT_ID = "impl_dept_id";
         /** 部门领导（子流程局部变量） */
diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/controller/FixedContact20260730Controller.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/controller/FixedContact20260730Controller.java
index b8fe9b0..b2fcd62 100644
--- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/controller/FixedContact20260730Controller.java
+++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/controller/FixedContact20260730Controller.java
@@ -103,6 +103,14 @@ public class FixedContact20260730Controller extends JeecgController<FixedContact
     public Result<String> add(@RequestBody FixedContact20260730Page fixedContact20260730Page) {
         FixedContact20260730 fixedContact20260730 = new FixedContact20260730();
         org.springframework.beans.BeanUtils.copyProperties(fixedContact20260730Page, fixedContact20260730);
+        // 必填校验：表单编号、定点联系所领导、主办部门、申请人为创建一条有效记录的基础字段
+        if (oConvertUtils.isEmpty(fixedContact20260730.getFormNo())
+                || oConvertUtils.isEmpty(fixedContact20260730.getContactLeader())
+                || oConvertUtils.isEmpty(fixedContact20260730.getHostDept())
+                || oConvertUtils.isEmpty(fixedContact20260730.getApplicant())) {
+            return Result.error("表单编号、定点联系所领导、主办部门、申请人为必填项");
+        }
+        fixedContact20260730.setBpmStatus(BpmStatus.NOT_START.getCode());
         fixedContact20260730Service.saveMain(fixedContact20260730, fixedContact20260730Page.getFixedContactFeedback20260730List());
         return Result.OK("添加成功！");
     }
@@ -132,6 +140,9 @@ public class FixedContact20260730Controller extends JeecgController<FixedContact
     @RequiresPermissions("bg.fixcontact:fixed_contact_20260730:delete")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        if (fixedContact20260730Service.getById(id) == null) {
+            return Result.error("未找到对应数据");
+        }
         fixedContact20260730Service.delMain(id);
         terminateRelatedProcess(id);
         return Result.OK("删除成功!");