!119 fix(fixcontact): 修复 E2E 测试发现的 5 项问题

Merge pull request !119 from wsm/fix/fix_contact_20260807

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);
             }
 

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";
         /** 部门领导（子流程局部变量） */

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("删除成功!");