流程更新

pro-base/src/main/java/com/idea/oa/activiti/service/ProActiService.java

@@ -352,7 +352,7 @@ public class ProActiService {
             }
             //当发现this.getCurrRole(myframeUser);获取的角色是普通员工的时候,就知道他作为审核人只是直接上级,并不是领导,所以把角色调上一级
             if (currRole.equals(ConstantFlowType.FLOW_ROLES_DEPT[0])) {
-                currRole = ConstantFlowType.FLOW_ROLES_DEPT[1];
+                currRole = ConstantFlowType.FLOW_ROLES_DEPT[2];
             }
             // 不是出纳的情况下进行的判断
             //1.如果当前角色是自己,就进行正常的审核流程 ok

pro-base/src/main/java/com/idea/oa/flow2/mapper/FlowMainExtendMapper.java

@@ -30,11 +30,16 @@ public interface FlowMainExtendMapper {
     @Select("SELECT frame_user.* FROM frame_role_data_user LEFT JOIN frame_role_data ON frame_role_data.id=frame_role_data_user.role_data_id LEFT JOIN frame_user ON frame_user.id=frame_role_data_user.user_id WHERE frame_role_data.role_key=#{roleKey} AND frame_role_data.role_type=#{roleType} ")
     List<FrameUser> findFrameUsersByRoleKey(@Param("roleKey")String roleKey,@Param("roleType")String roleType);
 
+//    @Select("SELECT frame_user.* FROM frame_role_data_user " +
+//            "LEFT JOIN frame_role_data ON frame_role_data.id=frame_role_data_user.role_data_id " +
+//            "LEFT JOIN frame_user ON frame_user.id=frame_role_data_user.user_id " +
+//            "WHERE frame_role_data.role_key=#{roleKey} AND frame_role_data.role_type=#{roleType} " +
+//            "AND frame_user.group_id=#{groupId} AND frame_user.status = '1'")
     @Select("SELECT frame_user.* FROM frame_role_data_user " +
             "LEFT JOIN frame_role_data ON frame_role_data.id=frame_role_data_user.role_data_id " +
             "LEFT JOIN frame_user ON frame_user.id=frame_role_data_user.user_id " +
             "WHERE frame_role_data.role_key=#{roleKey} AND frame_role_data.role_type=#{roleType} " +
-            "AND frame_user.group_id=#{groupId} AND frame_user.status = '1'")
+            "AND frame_user.status = '1'")
     List<FrameUser> findFrameUsersByRoleKeyAndGroup(@Param("roleKey")String roleKey, @Param("roleType")String roleType,
                                             @Param("groupId")String groupId);