diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
index a74e36f8..2c3ce1db 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
@@ -21,8 +21,32 @@
             <if test="startComName != null  and startComName != ''"> and fa.startComName like concat('%', #{startComName}, '%')</if>
             <if test="startProId != null and startProId != ''"> and fa.startProId = #{startProId}</if>
             <if test="startProName != null  and startProName != ''"> and fa.startProName like concat('%', #{startProName}, '%')</if>
-            <if test='activeTags == "await"'> and fa.finishTime is null</if>
-            <if test='activeTags == "finished"'> and fa.finishTime is not null</if>
+            <choose>
+                <when test='activeTags == "depts"'> and fa.category = '1'</when>
+                <when test='activeTags == "users"'> and fa.category in ('2','3','4','5','6','8')</when>
+            </choose>
+            <if test="groupIds != null and groupIds.size()>0">
+                and bus.sub_dept_group in
+                <foreach collection="groupIds" item="groupId" open="(" separator="," close=")">
+                    #{groupId}
+                </foreach>
+            </if>
+            <if test="assigneeId != null  and roleIds != null and roleIds.size()>0">
+                AND (fa.ASSIGNEE_ = #{assigneeId}
+                    OR (
+                        fa.ASSIGNEE_ IS NULL
+                            AND (
+                                fa.USER_ID_ = #{assigneeId}
+                                    OR (
+                                    fa.GROUP_ID_ IN
+                                    <foreach collection="roleIds" item="roleId" open="(" separator="," close=")">
+                                        #{roleId}
+                                    </foreach>
+                            )
+                        )
+                    )
+                )
+            </if>
         </where>
         order by fa.createTime desc
     </select>
@@ -54,12 +78,16 @@
     <!--查询我的代办任务-->
     <select id="selectMyAwaitFlowTask" parameterType="FlowTaskEntity" resultType="Map">
         select fa.*
-        <if test='activeTags == "depts"'>, sud.business_license_path as businessImg, bus.sub_dept_name as businessMk1, sdd.dict_label as businessMk2, sud.sub_dept_code as businessMk3</if>
-        <if test='activeTags == "users"'>, bus.user_picture as businessImg, bus.card_code as businessMk1, sdd.dict_label as businessMk2, bus.sub_dept_name as businessMk3</if>
-        from vw_flow_await fa
-        <if test='activeTags == "depts"'> left join pro_project_info_subdepts_users bus on bus.id = fa.businessKey left join pro_project_info_subdepts sud on sud.id = bus.sub_dept_id left join sys_dict_data sdd on sdd.dict_value = bus.sub_dept_type and sdd.dict_type='sub_dept_type' </if>
-        <if test='activeTags == "users" or (groupIds != null and groupIds.size()>0)'> left join pro_project_info_subdepts_users bus on bus.id = fa.businessKey left join sys_dict_data sdd on sdd.dict_value = bus.craft_post and sdd.dict_type='pro_craft_post'</if>
-        where
+        <choose>
+            <when test='activeTags == "depts"'>, sud.business_license_path as businessImg, bus.sub_dept_name as businessMk1, sdd.dict_label as businessMk2, sud.sub_dept_code as businessMk3</when>
+            <when test='activeTags == "users"'>, bus.user_picture as businessImg, bus.card_code as businessMk1, sdd.dict_label as businessMk2, bus.sub_dept_name as businessMk3</when>
+        </choose>
+           from vw_flow_await fa
+        <choose>
+            <when test='activeTags == "depts"'> left join pro_project_info_subdepts_users bus on bus.id = fa.businessKey left join pro_project_info_subdepts sud on sud.id = bus.sub_dept_id left join sys_dict_data sdd on sdd.dict_value = bus.sub_dept_type and sdd.dict_type='sub_dept_type' </when>
+            <when test='activeTags == "users" or (groupIds != null and groupIds.size()>0)'> left join pro_project_info_subdepts_users bus on bus.id = fa.businessKey left join sys_dict_data sdd on sdd.dict_value = bus.craft_post and sdd.dict_type='pro_craft_post'</when>
+        </choose>
+           where
             fa.taskName != '申请人提交'
             <if test="procDefName != null  and procDefName != ''"> and fa.procDefName like concat('%', #{procDefName}, '%')</if>
             <if test="businessKey != null  and businessKey != ''"> and fa.businessKey = #{businessKey}</if>