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

---
 ...nologyEvaluationItemResultEOServiceImpl.java |  9 ++++++---
 jero-web/src/components/search/index.vue        | 17 ++++++++++++++---
 .../components/evaluationResultsList.vue        |  2 +-
 .../components/problemKnowledgeBaseList.vue     |  6 +++---
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java
index ec8655d2d..79d84035b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java
@@ -216,9 +216,12 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl
 			List<SysCategory> categoryList = sysCategoryService.list();
 			for (LawsTechnologyEvaluationItemResultEO data : datas) {
 				String evaluationMethods = data.getEvaluationMethods();
-				List<String> evaluationMethodsList = Arrays.asList(evaluationMethods.split(","));
-				String name = getTreeName(cut, categoryList, evaluationMethodsList);
-				data.setEvaluationMethodsName(name);
+				if(StringUtils.isNotEmpty(evaluationMethods)){
+					List<String> evaluationMethodsList = Arrays.asList(evaluationMethods.split(","));
+					String name = getTreeName(cut, categoryList, evaluationMethodsList);
+					data.setEvaluationMethodsName(name);
+				}
+
 				if(StringUtils.isNotEmpty(data.getComplianceResult())){
 					data.setComplianceResultName(ComplianceResultEnum.getTextByValue(data.getComplianceResult(),cut));
 				}
diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue
index d4cb9c1a2..5a3608ddb 100644
--- a/jero-web/src/components/search/index.vue
+++ b/jero-web/src/components/search/index.vue
@@ -298,8 +298,7 @@
   }
 
   .title-text {
-    width: 20%;
-    min-width: 100px;
+    width: 100px;
     color: #000F16;
     display: inline-block;
     font-weight: 500;
@@ -315,7 +314,7 @@
   .box-input {
     /*min-width: 200px;*/
     display: inline-block;
-    width: 70%;
+    width: calc(100% - 116px);
     height: 38px;
     margin-top: 2px;
   }
@@ -324,4 +323,16 @@
     height: 38px;
     /*margin-top: 2px;*/
   }
+
+  ::v-deep .ant-select-tree {
+    width: auto;
+    height: 300px;
+    overflow: auto;
+    position: absolute;
+    /*background: #fff;*/
+  }
+
+  ::v-deep .ant-select-tree-dropdown {
+    min-height: 320px;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
index bdaa64268..8ed494f25 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
@@ -20,7 +20,7 @@
         size="middle"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: '100%'}"
+        :scroll="{x: '100%',y:'calc(100vh - 320px)'}"
         :data-source="dataSource"
         :columns="columns"
       >
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
index 2b3175a5f..ec476304d 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
@@ -26,15 +26,15 @@
         </template>
       </div>
       <div class="box-content-right">
-        <div @click="classificationClick" class="operator-text" v-has="'virtual:set:creater'">
+        <div @click="classificationClick" class="operator-text">
           <a-icon type="setting"/>
           {{$t('classificationMaintenance')}}
         </div>
-        <div @click="managePublishingClick" class="operator-text" v-has="'virtual:set:creater'">
+        <div @click="managePublishingClick" class="operator-text">
           <a-icon type="carry-out"/>
           {{$t('managePublishing')}}
         </div>
-        <div @click="newlyAddedClick" class="operator-text" v-has="'virtual:set:creater'">
+        <div @click="newlyAddedClick" class="operator-text">
           <a-icon type="plus"/>
           {{$t('newlyAdded')}}
         </div>