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) - - 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;