diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowBusinessKeyServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowBusinessKeyServiceImpl.java
index aa199912..de8f5555 100644
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowBusinessKeyServiceImpl.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowBusinessKeyServiceImpl.java
@@ -1,7 +1,6 @@
 package com.ruoyi.flowable.service.impl;
 
 import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.flowable.service.IFlowBusinessKeyService;
 import com.ruoyi.system.domain.FlowTaskEntity;
 import com.ruoyi.system.mapper.FlowBusinessKeyMapper;
@@ -13,7 +12,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 业务工作流程自定义
diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java
index 83dc2de0..f5b539e0 100644
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java
@@ -6,9 +6,7 @@ import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.flowable.common.constant.ProcessConstants;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.flowable.common.enums.FlowComment;
-import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.domain.FlowProcDefDto;
 import com.ruoyi.flowable.factory.FlowServiceFactory;
 import com.ruoyi.flowable.service.IFlowDefinitionService;
@@ -22,7 +20,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.flowable.bpmn.model.BpmnModel;
 import org.flowable.bpmn.model.FlowElement;
-import org.flowable.bpmn.model.GraphicInfo;
 import org.flowable.engine.repository.Deployment;
 import org.flowable.engine.repository.ProcessDefinition;
 import org.flowable.engine.repository.ProcessDefinitionQuery;
@@ -37,7 +34,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 流程定义
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/FlowableController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/FlowableController.java
index 161f42a6..1821726e 100644
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/FlowableController.java
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/FlowableController.java
@@ -1,10 +1,14 @@
 package com.ruoyi.web.flowable.controller;
 
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.SysRoleEnum;
 import com.ruoyi.flowable.domain.dto.FlowTaskDto;
 import com.ruoyi.flowable.domain.vo.FlowTaskVo;
 import com.ruoyi.flowable.domain.vo.StartTaskVO;
@@ -19,8 +23,9 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @version : V1.0
@@ -33,6 +38,9 @@ import java.util.Map;
 @RequestMapping("/wechat/flowTask")
 public class FlowableController extends BaseController {
 
+    @Autowired
+    private RedisCache redisCache;
+
     @Autowired
     private ISysUserService sysUserService;
 
@@ -195,6 +203,26 @@ public class FlowableController extends BaseController {
         return getDataTable(flowBusinessKeyService.selectMyAwaitFlowTask(flowTaskEntity));
     }
 
+    /**
+     * 根据条件查询我的代办任务数量
+     * @param flowTaskEntity
+     * @return
+     */
+    @PostMapping(value = "/myAwaitFlowTaskListCount")
+    public AjaxResult myAwaitFlowTaskListCount(@RequestBody FlowTaskEntity flowTaskEntity) {
+        //设置缓存
+        String key="wechat_flowTask_myAwaitFlowTaskListCount-nowRole="+flowTaskEntity.getNowRole()+"-nowDept="+flowTaskEntity.getNowDept()+"-nowUserName="+flowTaskEntity.getNowUserName()+"-nowUser="+flowTaskEntity.getNowUser();
+        Object obj=redisCache.getCacheObject(key);
+        if(obj!=null){
+            return success(obj);
+        }
+        //这里不分页，这里实时查询用户角色
+        flowTaskEntity.setRoleIds(sysUserService.selectUserRoles(flowTaskEntity.getNowUserName()));
+        List<Map<String, Object>> list = flowBusinessKeyService.selectMyAwaitFlowTask(flowTaskEntity);
+        redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
+        return success(list);
+    }
+
     /**
      * 根据条件查询我的已办任务
      * @param flowTaskEntity
@@ -206,4 +234,25 @@ public class FlowableController extends BaseController {
         return getDataTable(flowBusinessKeyService.selectMyFinishedFlowTask(flowTaskEntity));
     }
 
+    /**
+     * 根据条件查询所有流任务
+     * @param flowTaskEntity
+     * @return
+     */
+    @GetMapping(value = "/allList")
+    public TableDataInfo allList(FlowTaskEntity flowTaskEntity) {
+        startPage();
+        return getDataTable(flowBusinessKeyService.selectAllFlowTaskByParams(flowTaskEntity));
+    }
+
+    /**
+     * 根据条件统计所有流任务
+     * @param flowTaskEntity
+     * @return
+     */
+    @GetMapping(value = "/queryCount")
+    public AjaxResult queryCount(FlowTaskEntity flowTaskEntity) {
+        return success(flowBusinessKeyService.quueryCount(flowTaskEntity));
+    }
+
 }
diff --git a/ruoyi-wechat/src/main/resources/mapper/WechatUserLoginMapper.xml b/ruoyi-wechat/src/main/resources/mapper/WechatUserLoginMapper.xml
index 6d19d8d2..69c0fefa 100644
--- a/ruoyi-wechat/src/main/resources/mapper/WechatUserLoginMapper.xml
+++ b/ruoyi-wechat/src/main/resources/mapper/WechatUserLoginMapper.xml
@@ -129,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			smc.del_flag = 0
 			AND su.phonenumber = #{username}
 			<if test="type != null and type != ''"> and smc.menu_type=#{type}</if>
+			<if test="type == null or type == ''"> and (smc.menu_type = '' or smc.menu_type is null) </if>
 		order by smc.menu_sort asc
 	</select>