From 46da17f75eca223d75bbbb6980b2b3453974fefe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Thu, 28 Mar 2024 14:46:12 +0800
Subject: [PATCH] =?UTF-8?q?CN-1582=20fix:=201=E3=80=81=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E8=AF=86=E5=88=ABschema=E4=B8=AD=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=9A=84subscriber.id=E5=AD=97=E6=AE=B5=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84=E5=B7=A6=E4=BE=A7filter=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B2=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E8=8E=B7=E5=8F=96tag=E5=88=97=E8=A1=A8=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=9B=A0subscriber=E6=B2=A1=E6=9C=89tag=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84=E6=8E=A5=E5=8F=A3url=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E9=80=A0=E6=88=90=E7=9A=84=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/entityExplorer/EntityExplorer.vue |  2 +-
 src/views/entityExplorer/entityList/Row.vue | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/views/entityExplorer/EntityExplorer.vue b/src/views/entityExplorer/EntityExplorer.vue
index 4cf9d35c..e9d882d3 100644
--- a/src/views/entityExplorer/EntityExplorer.vue
+++ b/src/views/entityExplorer/EntityExplorer.vue
@@ -577,7 +577,7 @@ export default {
     },
     /** 新版查询filter数据 */
     queryFilterNew (params) {
-      const subscriberList = ['subscriber.phone_number', 'subscriber.imei', 'subscriber.imsi', 'subscriber.apn']
+      const subscriberList = ['subscriber.id', 'subscriber.phone_number', 'subscriber.imei', 'subscriber.imsi', 'subscriber.apn']
       let subscriberFlag = false
       subscriberList.forEach(item => {
         if (params.q.indexOf(item) > -1) {
diff --git a/src/views/entityExplorer/entityList/Row.vue b/src/views/entityExplorer/entityList/Row.vue
index 428d3aac..ead654ce 100644
--- a/src/views/entityExplorer/entityList/Row.vue
+++ b/src/views/entityExplorer/entityList/Row.vue
@@ -293,16 +293,18 @@ export default {
           break
         }
       }
-      axios.get(`${url}?resource=${this.entity.entityValue}`).then(responese => {
-        const res = responese.data
-        if (responese.status === 200) {
-          formatTags(res.data, this.entity.entityType, this.levelTwoTags)
-          if (_.isArray(res.data.userDefinedTags)) {
-            this.levelTwoTags = _.concat(this.levelTwoTags, res.data.userDefinedTags.map(tag => ({ value: tag.tagValue, color: tag.knowledgeBase ? tag.knowledgeBase.color : entityDefaultColor })))
+      if (this.entity.entityType !== 'subscriber_id') {
+        axios.get(`${url}?resource=${this.entity.entityValue}`).then(responese => {
+          const res = responese.data
+          if (responese.status === 200) {
+            formatTags(res.data, this.entity.entityType, this.levelTwoTags)
+            if (_.isArray(res.data.userDefinedTags)) {
+              this.levelTwoTags = _.concat(this.levelTwoTags, res.data.userDefinedTags.map(tag => ({ value: tag.tagValue, color: tag.knowledgeBase ? tag.knowledgeBase.color : entityDefaultColor })))
+            }
+            this.hideTagArea = _.isEmpty(this.levelTwoTags)
           }
-          this.hideTagArea = _.isEmpty(this.levelTwoTags)
-        }
-      })
+        })
+      }
     },
     /* 切换折叠状态 */
     switchCollapse () {