我的流程、代办任务、已办任务、统计查询只查询流程定义标识为oa_开头的流程实例

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmProcessInstanceExtMapper.java

@@ -18,6 +18,8 @@ public interface BpmProcessInstanceExtMapper extends BaseMapperX<BpmProcessInsta
     default PageResult<BpmProcessInstanceExtDO> selectCCPage(Long userId, BpmProcessInstanceMyPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<BpmProcessInstanceExtDO>()
 //                .eqIfPresent(BpmProcessInstanceExtDO::getStartUserId, userId)
+                //只能查询流程标识定义为oa开头的流程
+                .likeIfPresent(BpmProcessInstanceExtDO::getProcessDefinitionId, "oa_")
                 .likeIfPresent(BpmProcessInstanceExtDO::getCcids, "[" + userId + "]")
                 .eqIfPresent(BpmProcessInstanceExtDO::getProcessDefinitionId, reqVO.getProcessDefinitionId())
                 .eqIfPresent(BpmProcessInstanceExtDO::getCategory, reqVO.getCategory())
@@ -30,6 +32,8 @@ public interface BpmProcessInstanceExtMapper extends BaseMapperX<BpmProcessInsta
 
     default PageResult<BpmProcessInstanceExtDO> selectPage(Long userId, BpmProcessInstanceMyPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<BpmProcessInstanceExtDO>()
+                //只能查询流程标识定义为oa开头的流程
+                .likeIfPresent(BpmProcessInstanceExtDO::getProcessDefinitionId, "oa_")
                 .eqIfPresent(BpmProcessInstanceExtDO::getStartUserId, userId)
                 .likeIfPresent(BpmProcessInstanceExtDO::getName, reqVO.getName())
                 .eqIfPresent(BpmProcessInstanceExtDO::getProcessDefinitionId, reqVO.getProcessDefinitionId())
@@ -57,6 +61,8 @@ public interface BpmProcessInstanceExtMapper extends BaseMapperX<BpmProcessInsta
     default PageResult<BpmProcessInstanceExtDO> selectStatisticePage(BpmProcessInstanceMyPageReqVO reqVO) {
         //如果为空，那么查询全部
         return selectPage(reqVO, new LambdaQueryWrapperX<BpmProcessInstanceExtDO>()
+                //只能查询流程标识定义为oa开头的流程
+                .likeIfPresent(BpmProcessInstanceExtDO::getProcessDefinitionId, "oa_leave")
                 .likeIfPresent(BpmProcessInstanceExtDO::getName, reqVO.getName())
                 .eqIfPresent(BpmProcessInstanceExtDO::getProcessDefinitionId, reqVO.getProcessDefinitionId())
                 .eqIfPresent(BpmProcessInstanceExtDO::getCategory, reqVO.getCategory())

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java

@@ -138,10 +138,13 @@ public class BpmTaskServiceImpl implements BpmTaskService {
     public PageResult<BpmTaskTodoPageItemRespVO> getTodoTaskPage(Long userId, BpmTaskTodoPageReqVO pageVO) {
         // 查询待办任务
         TaskQuery taskQuery = taskService.createTaskQuery().taskAssignee(String.valueOf(userId)) // 分配给自己
+                //只能查询流程标识定义为oa开头的流程
+                .processDefinitionKeyLike("oa_%")
                 .orderByTaskCreateTime().desc(); // 创建时间倒序
         if (StrUtil.isNotBlank(pageVO.getName())) {
             //流程定义的名称
             taskQuery.processDefinitionName(pageVO.getName());
+
 //            taskQuery.taskNameLike("%" + pageVO.getName() + "%");
         }
         if (ArrayUtil.get(pageVO.getCreateTime(), 0) != null) {
@@ -178,6 +181,8 @@ public class BpmTaskServiceImpl implements BpmTaskService {
         queryWrapperX.eq(BpmTaskExtDO::getDeleted, false);
         queryWrapperX.groupBy(BpmTaskExtDO::getName);
         queryWrapperX.select(BpmTaskExtDO::getName);
+        //只能查询流程标识定义为oa开头的流程
+        queryWrapperX.likeIfPresent(BpmTaskExtDO::getProcessDefinitionId,"oa_");
         List<BpmTaskExtDO> list = taskExtMapper.selectList(queryWrapperX);
         List<String> taskNames = list.stream().map(BpmTaskExtDO::getName)
                 .collect(Collectors.toList());
@@ -185,6 +190,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
         // 查询已办任务
         HistoricTaskInstanceQuery taskQuery = historyService.createHistoricTaskInstanceQuery().finished() // 已完成
                 .taskAssignee(String.valueOf(userId)) // 分配给自己
+                .processDefinitionKeyLike("oa_%")
                 .orderByHistoricTaskInstanceEndTime().desc(); // 审批时间倒序
         if (taskNames != null && !taskNames.isEmpty()) {
             /**

yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/task/BpmProcessInstanceExtMapper.xml

@@ -19,6 +19,7 @@
                 #{id}
             </foreach>
         </if>
+        AND process_definition_id like 'oa_%'
         GROUP BY name
     </select>
 
@@ -42,6 +43,7 @@
                 #{id}
             </foreach>
         </if>
+        AND process_definition_id like 'oa_%'
         GROUP BY result
     </select>
 
@@ -55,6 +57,7 @@
         WHERE end_time IS NOT NULL
         AND reason != '自动审批'
         AND deleted = FALSE
+        AND process_definition_id like 'oa_%'
         GROUP BY assignee_user_id order by userTime desc limit 0, 10
     </select>
 
@@ -72,6 +75,7 @@
                 #{id}
             </foreach>
         </if>
+        AND process_definition_id like 'oa_%'
         GROUP BY assignee_user_id
     </select>