From e9e6ae7992f239d92773d7bc51568d39c7bfc095 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 10 Nov 2023 12:31:05 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]cmdb=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=EF=BC=8C=E5=85=B3=E7=B3=BB=E8=8E=B7=E5=8F=96=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BC=A0=E5=8F=82bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-dialog.vue | 2 +-
 .../task/processdetail/workorder/cmdbsync/cmdbsync-detail.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-dialog.vue b/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-dialog.vue
index 65bdfd320..f053eb440 100644
--- a/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-dialog.vue
+++ b/src/views/pages/cmdb/flow/node/nodesetting/cmdbpolicy/cmdbsync-dialog.vue
@@ -378,7 +378,7 @@ export default {
     async getRelByCiId(ciId) {
       if (ciId) {
         let relList;
-        await this.$api.cmdb.ci.getRelByCiId(ciId, true, null, 1).then(res => {
+        await this.$api.cmdb.ci.getRelByCiId(ciId, {needAction: true, allowEdit: 1}).then(res => {
           relList = res.Return;
         });
         return relList;
diff --git a/src/views/pages/process/task/processdetail/workorder/cmdbsync/cmdbsync-detail.vue b/src/views/pages/process/task/processdetail/workorder/cmdbsync/cmdbsync-detail.vue
index 1cb29806f..c78b59b08 100644
--- a/src/views/pages/process/task/processdetail/workorder/cmdbsync/cmdbsync-detail.vue
+++ b/src/views/pages/process/task/processdetail/workorder/cmdbsync/cmdbsync-detail.vue
@@ -3,8 +3,8 @@
     <Alert v-if="!$utils.isEmpty(errorList)" type="error">
       <template slot="desc">
         <div v-for="(e,eindex) in errorList" :key="eindex">
-          {{ $t('dialog.title.createtarget',{'target':$t('page.fail')}) }}：{{ e.error.length > 500 && !e.isMore? e.error.slice(0,500) : e.error }}
-          <span v-if="e.error.length > 500" class="text-href pl-sm" @click="viewDetail(e)">{{ !e.isMore?$t('page.viewmore'):$t('page.packup') }}</span>
+          {{ $t('dialog.title.createtarget',{'target':$t('page.fail')}) }}：{{ e.error && e.error.length > 500 && !e.isMore? e.error.slice(0,500) : e.error }}
+          <span v-if="e.error && e.error.length > 500" class="text-href pl-sm" @click="viewDetail(e)">{{ !e.isMore?$t('page.viewmore'):$t('page.packup') }}</span>
         </div>
       </template>
     </Alert>
-- 
Gitee