From df276d0cdbe23818cf109a1c753d5950a3551826 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Thu, 27 Mar 2025 09:23:18 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E6=B5=81=E7=A8=8B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/visit/api/VisitMainOuterApi.java  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java b/src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java
index 69170be..da20ec5 100644
--- a/src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java
+++ b/src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java
@@ -225,16 +225,16 @@ public class VisitMainOuterApi {
         entity.setSubmitTime(LocalDateTime.now());
         visitMainService.saveOrUpdate(entity);
 
-        // 不管有没有跳过流程，始终要调用OA，跳过流程只针对OA来说
-//        if(visitTheme.getSkipApprovalFlag()!=null
-//                &&visitTheme.getSkipApprovalFlag().equals(ResultFlag.OK)){
-//            // 跳过审批
-//            visitMainService.doFinish(entity.getId(),null);
-//        }else {
-//            visitMainService.submitOaFlow(entity.getId());
-//        }
-        // 申请审批
-        visitMainService.submitOaFlow(entity.getId());
+        // 来访申请设置跳过审批，则直接完成来访登记，否则调用OA
+        if(visitTheme.getSkipApprovalFlag()!=null
+                &&visitTheme.getSkipApprovalFlag().equals(ResultFlag.OK)){
+            // 都需要调用OA(完成知会相关通知)
+            visitMainService.submitOaFlow(entity.getId());
+            // 忽略审批结果
+            visitMainService.doFinish(entity.getId(),null);
+        }else {
+            visitMainService.submitOaFlow(entity.getId());
+        }
         return R.ok(param.getId());
     }