From f4cdcdd7b4ffba6b5c023b4b8dae6be24ae5f586 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 21 Jan 2025 09:50:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/oa/biz/oaform/OaFormService.java    | 58 ++++++++++---------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java
index 52cd6906e6..ced5bc4a11 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java
@@ -503,33 +503,39 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
         if (r == 1) {
             //启动流程
             ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
-            UpdateFlowFieldVo ufVo = voResultBean.getData();
-            OaFormFlowDto oaFormFlowDto = new OaFormFlowDto();
-            BeanUtil.copyProperties(ufVo, oaFormFlowDto);
-            updateFlow(oaFormFlowDto);
-            try {
-                ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-                        .setNameFormat("demo-pool-%d").build();
-                ExecutorService pool = new ThreadPoolExecutor(2, 100,
-                        0L, TimeUnit.MILLISECONDS,
-                        new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
-                Future future1 = pool.submit(() -> {
-                    //极光推送
-                    MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
-                    MessageFlowVo messageFlowVo = new MessageFlowVo();
-                    BeanUtil.copyProperties(ufVo, messageFlowVo);
-                    messageFlowableQuery.setUfVo(messageFlowVo);
-                    messageFlowableQuery.setAppMap((Map<String, Object>) bv.getFormVariables().get("app"));
-                    messageFlowableQuery.setBusinessSid(dto.getBusinessSid());
-                    messageFlowableQuery.setModuleName(oaForm.getFormType());
-                    messageFlowableQuery.setMsgContent(oaForm.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
-                    messageFlowableQuery.setMsgTitle(oaForm.getFormType());
-                    messageFeign.pushMessage(messageFlowableQuery);
-                });
-            } catch (Exception e) {
-                e.printStackTrace();
+            if(voResultBean.getSuccess()){
+                UpdateFlowFieldVo ufVo = voResultBean.getData();
+                OaFormFlowDto oaFormFlowDto = new OaFormFlowDto();
+                BeanUtil.copyProperties(ufVo, oaFormFlowDto);
+                updateFlow(oaFormFlowDto);
+                try {
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                            .setNameFormat("demo-pool-%d").build();
+                    ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                            0L, TimeUnit.MILLISECONDS,
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                    Future future1 = pool.submit(() -> {
+                        //极光推送
+                        MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                        MessageFlowVo messageFlowVo = new MessageFlowVo();
+                        BeanUtil.copyProperties(ufVo, messageFlowVo);
+                        messageFlowableQuery.setUfVo(messageFlowVo);
+                        messageFlowableQuery.setAppMap((Map<String, Object>) bv.getFormVariables().get("app"));
+                        messageFlowableQuery.setBusinessSid(dto.getBusinessSid());
+                        messageFlowableQuery.setModuleName(oaForm.getFormType());
+                        messageFlowableQuery.setMsgContent(oaForm.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                        messageFlowableQuery.setMsgTitle(oaForm.getFormType());
+                        messageFeign.pushMessage(messageFlowableQuery);
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                return voResultBean;
+            }else{
+                return rb.setMsg(voResultBean.getMsg());
             }
-            return voResultBean;
+
+
         } else if (r == 2) {
             BusinessVariablesDto businessVariablesDto = new BusinessVariablesDto();
             BeanUtil.copyProperties(bv, businessVariablesDto);