task-6941 体系运行记录盒查询条件逻辑调整

src/views/platform/bpmn/bpmInstHis/list.vue

@@ -756,8 +756,8 @@ export default {
       let others = parameters.filter(i => !i.key.includes('create_by_'))
 
       // 提取部门条件（key为'Q^subject_^SL'）并合并为 OR 组
-      const deptConditions = others.filter(i => i.key === 'Q^subject_^SL')
-      const nonDeptConditions = others.filter(i => i.key !== 'Q^subject_^SL')
+      const deptConditions = others.filter(i => i.key === 'Q^dep^SL' || i.key === 'Q^formName^SL' || i.key === 'Q^transDesc^SL' )
+      const nonDeptConditions = others.filter(i => i.key !== 'Q^dep^SL' && i.key !== 'Q^formName^SL' && i.key !== 'Q^transDesc^SL')
 
       let deptGroup = null
       if (deptConditions.length > 1) {
@@ -770,7 +770,9 @@ export default {
         deptGroup = deptConditions[0]
       }
 
-      // 重新构建 others：非部门条件 + 部门组（如果有）
+      console.log('好好好', deptConditions, nonDeptConditions)
+
+      // 重新构建 others：非部门条件 + 部门组（如果有）什么情况才会有
       const finalOthers = [...nonDeptConditions]
       if (deptGroup) {
         // 如果deptGroup是对象且具有relation，则作为子组；否则作为单个条件
@@ -825,6 +827,7 @@ export default {
       const result = []
       const special = ['dept', 'tableName', 'desc', 'createBy']
       Object.keys(data).forEach((key) => {
+        console.log('222222222',key, data[key])
         if (special.includes(key)) {
           if (key === 'createBy') {
             // 转换用户ID
@@ -838,26 +841,32 @@ export default {
             res.forEach((i) => {
               result.push({ key: 'Q^create_by_^SL', value: i })
             })
-          } else if (key === 'dept') {
+          } else if (key === 'dept') {  //formName transDesc dep
             if (this.deptSelect) {
-              result.push({ key: 'Q^subject_^SL', value: data[key] })
+              result.push({ key: 'Q^dep^SL', value: data[key] })
             } else {
               // 转换部门ID
               const t = this.deptList.filter((i) =>
                 i.positionName.includes(data[key])
               )
               if (!t.length) {
-                result.push({ key: 'Q^subject_^SL', value: data[key] })
+                result.push({ key: 'Q^dep^SL', value: data[key] })
               }
               const res = t.map((i) => i.positionId)
               res.forEach((i) => {
-                result.push({ key: 'Q^subject_^SL', value: i })
+                result.push({ key: 'Q^dep^SL', value: i })
               })
             }
-          } else {
-            result.push({ key: 'Q^subject_^SL', value: data[key] })
+          } else if (key === 'tableName') {
+            result.push({ key: 'Q^formName^SL', value: data[key] })
+          } else if (key === 'desc'){
+            result.push({ key: 'Q^transDesc^SL', value: data[key] })
           }
+          // else {
+          //   result.push({ key: 'Q^subject_^SL', value: data[key] })
+          // }
         } else {
+          console.log('不会走', key)
           result.push({ key, value: data[key] })
         }
       })