diff --git a/src/main/java/com/xqopen/kehui/mapper/SystemRoleDao.java b/src/main/java/com/xqopen/kehui/mapper/SystemRoleDao.java
index 3a01caf..2bded09 100644
--- a/src/main/java/com/xqopen/kehui/mapper/SystemRoleDao.java
+++ b/src/main/java/com/xqopen/kehui/mapper/SystemRoleDao.java
@@ -29,7 +29,7 @@ public interface SystemRoleDao extends BaseMapper<SystemRole> {
     SystemRole getLeaderRoleByDeptId(@Param("orgId") Long orgId);
 
     /**
-     * 通过账号id拿到角色集合
+     * 通过账号id拿到角色集合(流程职务表)
      * @param userId
      * @return
      */
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 90413ed..c5889d4 100644
--- a/src/main/java/com/xqopen/kehui/mapper/xml/SystemRoleDao.xml
+++ b/src/main/java/com/xqopen/kehui/mapper/xml/SystemRoleDao.xml
@@ -64,11 +64,12 @@
 		AND sor.org_id =#{orgId}
 	</select>
     <select id="getRoleListMap" resultType="java.util.Map">
-        select distinct * from system_user_login sul
-                                   left join personal_member pm  on  sul.userinfo_id=pm.id_ and sul.is_deleted=false and pm.is_deleted=false
-                                   left join system_user_role sug on sug.user_id=pm.id_ and sug.is_deleted=false
-                                   left join system_role sr on sug.role_id=sr.id_ and sr.is_deleted=false
-        where sul.id_=#{userId}
+select  distinct *
+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}
+
     </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 882e460..d7840b5 100644
--- a/src/main/java/com/xqopen/kehui/personal/action/PersonalEventsController.java
+++ b/src/main/java/com/xqopen/kehui/personal/action/PersonalEventsController.java
@@ -26,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.xml.crypto.Data;
@@ -133,12 +134,12 @@ public class PersonalEventsController implements PersonalEventsApi {
                                 if(!ObjectUtils.isEmpty(roleListMap)){
                                     for (int i = 0; i < roleListMap.size(); i++) {
                                         Map map = roleListMap.get(i);
-                                        String roleName = String.valueOf(map.get("role_name"));
+                                        String roleName = String.valueOf(map.get("approved_role"));
                                         switch (roleName){
-                                            case "副所长":
-                                            case "总支委员":
-                                            case "会主席":
-                                            case "部门主任":
+                                            case "depDirector": //副所长
+                                            case "generalBranch"://总支委员
+                                            case "unionChairman"://工会主席
+                                            case "business"://部门主任
                                                 flag = true;
                                                 break;
                                             default:
@@ -170,13 +171,15 @@ public class PersonalEventsController implements PersonalEventsApi {
                                         case "sickLeave":    //病假
                                             LocalDate start = LocalDate.parse(formatter.format(beginDate));
                                             LocalDate end = LocalDate.parse(formatter.format(endDate));
-                                            LocalTime beginTime = LocalTime.parse(beginM);
-                                            LocalTime endTime = LocalTime.parse(endM);
+                                            if(!StringUtils.isEmpty(beginM) & !StringUtils.isEmpty(endM)){
+                                                LocalTime beginTime = LocalTime.parse(beginM);
+                                                LocalTime endTime = LocalTime.parse(endM);
+                                                beginDate = Date.from(LocalDateTime.of(start, beginTime).atZone(ZoneId.systemDefault()).toInstant());
+                                                endDate = Date.from(LocalDateTime.of(end,endTime).atZone(ZoneId.systemDefault()).toInstant());
+                                            }
 //                                            LocalDateTime startDateTime = LocalDateTime.of(start, beginTime);
 //                                            LocalDateTime endDateTime = LocalDateTime.of(end, endTime);
 //                                            long days = ChronoUnit.DAYS.between(startDateTime, endDateTime);
-                                            beginDate = Date.from(LocalDateTime.of(start, beginTime).atZone(ZoneId.systemDefault()).toInstant());
-                                            endDate = Date.from(LocalDateTime.of(end,endTime).atZone(ZoneId.systemDefault()).toInstant());
                                             long msNum = endDate.getTime() - beginDate.getTime();
 //                                            long days=msNum/(24*60*60*1000);
                                             long days=msNum%(24*60*60*1000)==0?msNum/(24*60*60*1000):msNum/(24*60*60*1000)+1;