From 92b0dfd6e7f742d27eafb3ebc0d87463d1c06f12 Mon Sep 17 00:00:00 2001
From: zty <1048209592@qq.com>
Date: Thu, 8 Aug 2024 14:42:39 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=AF=B7=E5=81=87=E6=97=B6=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=B8=BB=E4=BB=BB=EF=BC=8C=E5=8F=AA=E8=83=BD?=
 =?UTF-8?q?=E6=98=AF=E4=BA=94=E4=B8=AA=E4=B8=9A=E5=8A=A1=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E6=89=8D=E7=AE=97=20sql=E4=B8=8Eswitch=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xqopen/kehui/mapper/xml/SystemRoleDao.xml   |  3 ---
 .../personal/action/PersonalEventsController.java   | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/xqopen/kehui/mapper/xml/SystemRoleDao.xml b/src/main/java/com/xqopen/kehui/mapper/xml/SystemRoleDao.xml
index 3283409..452fd50 100644
--- a/src/main/java/com/xqopen/kehui/mapper/xml/SystemRoleDao.xml
+++ b/src/main/java/com/xqopen/kehui/mapper/xml/SystemRoleDao.xml
@@ -69,9 +69,6 @@ from flows_configuration fc
          left join personal_member pm on fc.approver_id = pm.id_ and pm.is_deleted=false
          left join system_user_login sul on sul.userinfo_id = pm.id_ and sul.is_deleted=false
 where fc.is_deleted=false and sul.id_=#{userId}
-and fc.org_id in (939036815719927809,1215549953418465281,1215550126769049601,1496282215842058241,1215550163188191233)
-
-
     </select>
 
 </mapper>
diff --git a/src/main/java/com/xqopen/kehui/personal/action/PersonalEventsController.java b/src/main/java/com/xqopen/kehui/personal/action/PersonalEventsController.java
index d7840b5..58c1aa2 100644
--- a/src/main/java/com/xqopen/kehui/personal/action/PersonalEventsController.java
+++ b/src/main/java/com/xqopen/kehui/personal/action/PersonalEventsController.java
@@ -135,12 +135,23 @@ public class PersonalEventsController implements PersonalEventsApi {
                                     for (int i = 0; i < roleListMap.size(); i++) {
                                         Map map = roleListMap.get(i);
                                         String roleName = String.valueOf(map.get("approved_role"));
+                                        String orgId = String.valueOf(map.get("org_id"));
                                         switch (roleName){
                                             case "depDirector": //副所长
                                             case "generalBranch"://总支委员
                                             case "unionChairman"://工会主席
+                                                flag=true;
+                                                break;
                                             case "business"://部门主任
-                                                flag = true;
+                                                switch (orgId){//此处五个业务部部门主任才算
+                                                    case "939036815719927809":
+                                                    case "1215549953418465281":
+                                                    case "1215550126769049601":
+                                                    case "1496282215842058241":
+                                                    case "1215550163188191233":
+                                                        flag = true;
+                                                        break;
+                                                }
                                                 break;
                                             default:
                                                 flag = false;