fix: 固定按钮操作表单类型非空

zkqy-business/src/main/java/com/zkqy/business/controller/CommonBtnController.java

@@ -118,7 +118,7 @@ public class CommonBtnController extends BaseController {
      */
     public AjaxResult insertBtn(CommonEntity commonEntity, DragTableBtn dragTableBtn) throws JsonProcessingException {
         if (commonEntity.getBasicMap().get("visible").toString().equals("true")) {
-            if (dragTableBtn.getBtnFormType().equals("dragFormGroup")) {
+            if (dragTableBtn.getBtnFormType() != null && dragTableBtn.getBtnFormType().equals("dragFormGroup")) {
                 // 表格组添加逻辑
                 BpmRunNodeFormDateVo bpmRunNodeFormDateVo = JSON.parseObject(JSON.toJSONString(commonEntity.getBasicMap().get("BpmRunNodeFormDateVo")), BpmRunNodeFormDateVo.class);
                 return AjaxResult.btnMessage(echoNodeFormData.handleSubmitForm(bpmRunNodeFormDateVo));
@@ -126,7 +126,7 @@ public class CommonBtnController extends BaseController {
                 return AjaxResult.btnMessage(commonService.batchInsert(commonEntity));
             }
         } else if (commonEntity.getBasicMap().get("visible").toString().equals("false")) {
-            if (dragTableBtn.getBtnFormType().equals("dragFormGroup")) {
+            if (dragTableBtn.getBtnFormType() != null && dragTableBtn.getBtnFormType().equals("dragFormGroup")) {
                 return success(getFormGroupInfo(commonEntity, dragTableBtn));
             } else {
                 String sqlKey = commonEntity.getBasicMap().get("sqlKey").toString();
@@ -166,7 +166,7 @@ public class CommonBtnController extends BaseController {
 //                    //irunImplementationClass.RunScriptImplementationClassLogicCode(iScriptEntity,commonEntity.toString());
 //                }
 //            }
-            if (dragTableBtn.getBtnFormType().equals("dragFormGroup")) {
+            if (dragTableBtn.getBtnFormType() != null && dragTableBtn.getBtnFormType().equals("dragFormGroup")) {
                 // 表格组添加逻辑
                 BpmRunNodeFormDateVo bpmRunNodeFormDateVo = JSON.parseObject(JSON.toJSONString(commonEntity.getBasicMap().get("BpmRunNodeFormDateVo")), BpmRunNodeFormDateVo.class);
                 return AjaxResult.btnMessage(echoNodeFormData.handleSubmitForm(bpmRunNodeFormDateVo));
@@ -183,7 +183,7 @@ public class CommonBtnController extends BaseController {
                 // 返回结果
                 map.put("result", commonService.getInfoById(commonEntity));
                 return success(map);
-            } else if (dragTableBtn.getBtnFormType().equals("dragFormGroup")) {
+            } else if (dragTableBtn.getBtnFormType() != null && dragTableBtn.getBtnFormType().equals("dragFormGroup")) {
 
                 // 当前按钮绑定的是表单组
                 return success(getFormGroupInfo(commonEntity, dragTableBtn));
@@ -338,7 +338,7 @@ public class CommonBtnController extends BaseController {
                 }
             }
             // 如果当前发起流程表单使用的是表单组
-            if (dragTableBtn.getBtnFormType().equals("dragFormGroup")) {
+            if (dragTableBtn.getBtnFormType() != null && dragTableBtn.getBtnFormType().equals("dragFormGroup")) {
                 BpmRunNodeFormDateVo bpmRunNodeFormDateVo = JSON.parseObject(JSON.toJSONString(commonEntity.getBasicMap().get("BpmRunNodeFormDateVo")), BpmRunNodeFormDateVo.class);
                 echoNodeFormData.handleSubmitForm(bpmRunNodeFormDateVo);
                 return AjaxResult.success("启动流程成功！");
@@ -363,7 +363,7 @@ public class CommonBtnController extends BaseController {
                 map.put("template", dragForm);
                 // 展示当前按钮绑定的表单
                 return success(map);
-            } else if (dragTableBtn.getBtnFormType().equals("dragFormGroup")) {  // 多个表单
+            } else if (dragTableBtn.getBtnFormType() != null && dragTableBtn.getBtnFormType().equals("dragFormGroup")) {  // 多个表单
                 return success(getFormGroupInfo(commonEntity, dragTableBtn));
             } else if (dragTableBtn.getBtnFormType().equals("other")) {// 其他表单