Merge remote-tracking branch 'origin/binlog' into binlog

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/flow/engine/service/impl/FlowEngineServiceImpl.java

@@ -97,7 +97,7 @@
   }

   @Override
   public IPage<FlowProcess> selectProcessPage(IPage<FlowProcess> page, String category, Integer mode) {
   public IPage<FlowProcess> selectProcessPage(IPage<FlowProcess> page, String category, String name, Integer mode) {
      ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery().latestVersion().orderByProcessDefinitionKey().asc();
      // 通用流程
      if (mode == FlowModeEnum.COMMON.getMode()) {
@@ -109,6 +109,9 @@
      }
      if (StringUtils.isNotEmpty(category)) {
         processDefinitionQuery.processDefinitionCategory(category);
      }
      if (StringUtils.isNotEmpty(name)) {
         processDefinitionQuery.processDefinitionName(name);
      }
      List<ProcessDefinition> processDefinitionList = processDefinitionQuery.listPage(Func.toInt((page.getCurrent() - 1) * page.getSize()), Func.toInt(page.getSize()));
      List<FlowProcess> flowProcessList = new ArrayList<>();
@@ -201,7 +204,7 @@
                     User user = UserCache.getUser(TaskUtil.getUserId(taskUser));
                     if (user != null) {
                        flow.setAssignee(historicActivityInstance.getAssignee());
                        flow.setAssigneeName(user.getName());
                        flow.setAssigneeName(user.getRealName());
                     }
                  }
               }
@@ -211,7 +214,7 @@
               User user = UserCache.getUser(TaskUtil.getUserId(historicActivityInstance.getAssignee()));
               if (user != null) {
                  flow.setAssignee(historicActivityInstance.getAssignee());
                  flow.setAssigneeName(user.getName());
                  flow.setAssigneeName(user.getRealName());
               }
            }
            // 获取意见评论内容