From c67e05ef3eddb7fecb52f0df6950852faa5467c0 Mon Sep 17 00:00:00 2001
From: gaosong <gaosong@syxysoft.com>
Date: Fri, 26 Aug 2022 00:26:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E5=AF=B9=E6=AF=94-=E8=8F=9C=E5=8D=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../compare/service/impl/SarFileCompareInfoServiceImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java
index 24d378f67..c148912d6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java
@@ -17,6 +17,7 @@ import com.jero.modules.split.entity.SarFileSplitMenuEO;
 import com.jero.modules.split.service.IFileSplitItemsEOService;
 import com.jero.modules.split.service.ISarFileSplitInfoService;
 import com.jero.modules.split.service.ISarFileSplitMenuEOService;
+import com.jero.modules.system.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -275,7 +276,7 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl<SarFileCompareInf
         sfVo.setComments(sfcInfo.getComments());
         List<SarFileCompareMenu> menuList = sarFileCompareMenuService.queryListByInfoId(id);
         for (SarFileCompareMenu menu : menuList) {
-            if ("General catalogue".equals(menu.getName())) {
+            if (StringUtils.isBlank(menu.getParentId()) || "General catalogue".equals(menu.getName()) || "General Catalogue".equals(menu.getName())) {
                 if (menu.getLeftOrRight().equals(CompareConst.POS_LEFT)) {
                     SarFileCompareMenuVo menuLeft = new SarFileCompareMenuVo(menu);
                     menuLeft.setChildren(getMenuChildren(menuList, CompareConst.POS_LEFT, menuLeft.getMenuId()));

From 011963e1ca080266bdabc65d06fa3ad675deee72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com>
Date: Fri, 26 Aug 2022 09:17:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
 =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../problemKnowledgeBase/components/countryCardRelease.vue  | 6 +++---
 .../problemKnowledgeBase/components/countryCardView.vue     | 6 +++---
 .../components/problemKnowledgeBaseRelease.vue              | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
index ef8eccc3b..74303385f 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
@@ -3,9 +3,9 @@
     <div class="doc-detail-wrap">
       <div class="doc-detail-header" style="position: fixed;top: 0">
         <div class="doc-detail-title">
-           <span style="line-height: 66px;display: inline-block;float: left">
-             <a-icon type="arrow-left" style="margin-right: 6px;"/>
-           </span>
+<!--           <span style="line-height: 66px;display: inline-block;float: left">-->
+<!--             <a-icon type="arrow-left" style="margin-right: 6px;"/>-->
+<!--           </span>-->
           {{$t('managePublishing')}}
         </div>
       </div>
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue
index 1ba768a85..7b2dc2aa0 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue
@@ -3,9 +3,9 @@
     <div class="doc-detail-wrap">
       <div class="doc-detail-header" style="position: fixed;top: 0">
         <div class="doc-detail-title">
-           <span style="line-height: 66px;display: inline-block;float: left">
-             <a-icon type="arrow-left" style="margin-right: 6px;"/>
-           </span>
+<!--           <span style="line-height: 66px;display: inline-block;float: left">-->
+<!--             <a-icon type="arrow-left" style="margin-right: 6px;"/>-->
+<!--           </span>-->
           {{header_text}}
         </div>
       </div>
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
index f752ef697..80f587226 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
@@ -3,9 +3,9 @@
     <div class="doc-detail-wrap">
       <div class="doc-detail-header" style="position: fixed;top: 0">
         <div class="doc-detail-title">
-           <span style="line-height: 66px;display: inline-block;float: left" @click="backClick">
-             <a-icon type="arrow-left" style="margin-right: 6px;"/>
-           </span>
+<!--           <span style="line-height: 66px;display: inline-block;float: left" @click="backClick">-->
+<!--             <a-icon type="arrow-left" style="margin-right: 6px;"/>-->
+<!--           </span>-->
           {{$t('managePublishing')}}
         </div>
       </div>