From caa31a67fed1c38c8ee1d000f0c3aea76187f0b6 Mon Sep 17 00:00:00 2001
From: GoldenZqqq <1361001127@qq.com>
Date: Tue, 19 Nov 2024 15:54:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2-=E5=B7=A6=E4=BE=A7=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8F=AA=E5=B1=95=E7=A4=BA=E6=9C=89=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E7=9A=84=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../create/ProcessDefinitionDetail.vue        |  6 +++--
 .../bpm/processInstance/create/index.vue      | 25 ++++++++++++++++---
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
index 50d3fbd7..610963e1 100644
--- a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
+++ b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
@@ -162,8 +162,10 @@ const getApprovalDetail = async (row: any) => {
     startUserSelectTasks.value = data.activityNodes?.filter(
       (node: ApprovalNodeInfo) => CandidateStrategy.START_USER_SELECT === node.candidateStrategy
     )
-    for (const node of startUserSelectTasks.value) {
-      startUserSelectAssignees.value[node.id] = []
+    if (startUserSelectTasks.value?.length > 0) {
+      for (const node of startUserSelectTasks.value) {
+        startUserSelectAssignees.value[node.id] = []
+      }
     }
 
     // 获取审批节点，显示 Timeline 的数据
diff --git a/src/views/bpm/processInstance/create/index.vue b/src/views/bpm/processInstance/create/index.vue
index a028b0e7..4253448f 100644
--- a/src/views/bpm/processInstance/create/index.vue
+++ b/src/views/bpm/processInstance/create/index.vue
@@ -22,7 +22,7 @@
         <el-col :span="5">
           <div class="flex flex-col">
             <div
-              v-for="category in categoryList"
+              v-for="category in availableCategories"
               :key="category.code"
               class="flex items-center p-10px cursor-pointer text-14px rounded-md"
               :class="categoryActive.code === category.code ? 'text-#3e7bff bg-#e8eeff' : ''"
@@ -137,9 +137,11 @@ const getCategoryList = async () => {
   try {
     // 流程分类
     categoryList.value = await CategoryApi.getCategorySimpleList()
-    // 选中首个分类
-    if (categoryList.value.length > 0) {
-      categoryActive.value = categoryList.value[0]
+    // 等待流程定义数据加载完成后再设置默认选中分类
+    await nextTick()
+    // 选中第一个有流程的分类
+    if (availableCategories.value.length > 0) {
+      categoryActive.value = availableCategories.value[0]
     }
   } finally {
   }
@@ -261,6 +263,21 @@ const handleScroll = (e) => {
 onMounted(() => {
   getList()
 })
+
+/** 过滤出有流程的分类列表 */
+const availableCategories = computed(() => {
+  if (!categoryList.value?.length || !processDefinitionGroup.value) {
+    return []
+  }
+  
+  // 获取所有有流程的分类代码
+  const availableCategoryCodes = Object.keys(processDefinitionGroup.value)
+  
+  // 过滤出有流程的分类
+  return categoryList.value.filter(category => 
+    availableCategoryCodes.includes(category.code)
+  )
+})
 </script>
 
 <style lang="scss" scoped>