From 1a7a1ce6966118e1993fce70a0288684e7921200 Mon Sep 17 00:00:00 2001
From: zhuyy <zhuyy@ydool.com>
Date: Fri, 16 Jun 2023 15:11:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=87=E6=A0=87=EF=BC=8C?=
 =?UTF-8?q?=E7=99=BB=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OrganizationServiceImpl.java | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ydool/staff/service/impl/OrganizationServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/OrganizationServiceImpl.java
index 676ec26..9d4fdab 100644
--- a/src/main/java/com/ydool/staff/service/impl/OrganizationServiceImpl.java
+++ b/src/main/java/com/ydool/staff/service/impl/OrganizationServiceImpl.java
@@ -142,13 +142,23 @@ public class OrganizationServiceImpl extends BaseService<OrganizationMapper, Org
                 audit.setAuditOrder(ArgsConst.WAITING);
                 audit.setApprover(user2.getId());
                 organization.setLastId(user2.getUserName());
-                WorkFlowNotice workFlowNotice = new WorkFlowNotice();
-                workFlowNotice.setStatus(Boolean.FALSE);
-                workFlowNotice.setFlowType(ArgsConst.PERSONNEL_INDICATORS);
-                workFlowNotice.setUserId(user2.getId());
-                workFlowNotice.setTitle(user.getUserName() + "的指标申报待你审批");
-                workFlowNotice.setFlowId(organization.getId());
-                workFlowNoticeService.save(workFlowNotice);
+                if (ArgsConst.PERSONNEL_INDICATORS.equals(type)) {
+                    WorkFlowNotice workFlowNotice = new WorkFlowNotice();
+                    workFlowNotice.setStatus(Boolean.FALSE);
+                    workFlowNotice.setFlowType(ArgsConst.PERSONNEL_INDICATORS);
+                    workFlowNotice.setUserId(user2.getId());
+                    workFlowNotice.setTitle(user.getUserName() + "的指标申报待你审批");
+                    workFlowNotice.setFlowId(organization.getId());
+                    workFlowNoticeService.save(workFlowNotice);
+                } else {
+                    WorkFlowNotice workFlowNotice = new WorkFlowNotice();
+                    workFlowNotice.setStatus(Boolean.FALSE);
+                    workFlowNotice.setFlowType(ArgsConst.PERSONNEL_INDICATORS);
+                    workFlowNotice.setUserId(user2.getId());
+                    workFlowNotice.setTitle(user.getUserName() + "的招聘登记待你审批");
+                    workFlowNotice.setFlowId(organization.getId());
+                    workFlowNoticeService.save(workFlowNotice);
+                }
             }
             auditMapper.insert(audit);
         }