From 6e7d741a1f66a396d9202bd16f890b2d3280ab48 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Mon, 8 Jan 2024 18:12:36 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug80046,80076?=
 =?UTF-8?q?=EF=BC=8C80079?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../questionAnswerLibrary/page/AnswerPage.vue      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue b/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue
index 98a1308d..96a1c202 100644
--- a/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue
+++ b/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue
@@ -2,7 +2,7 @@
   <internal-detail-page :title="pageTitle" :loading="loading">
     <div class="detail-page-title">{{ model.title }}</div>
     <div class="detail-page-second-title">
-      {{ $t('businessSupport.questionAnswer.poster') + '：' + model.orgCode_dictText + ' ' + model.userId_dictText }}
+      {{ $t('businessSupport.questionAnswer.poster') + '：' + (model.orgCode_dictText || '') + ' ' + (model.userId_dictText || '') }}
     </div>
     <div class="detail-page-part">
       <div class="detail-page-part-form">
@@ -56,7 +56,7 @@
         <div class="left-user-info">
           <a-avatar shape="square" :size="56" :src="getAvatarView(item.avatar)" icon="user"/>
           <p class="left-user-name">{{ item.name }}</p>
-          <p>{{ item.departName }}</p>
+          <p>{{ item.departName || '' }}</p>
         </div>
         <div class="right-answer-wrapper">
           <!--  是否是置顶  -->
@@ -70,14 +70,14 @@
               <!--  取消置顶  -->
               <a class="right-bottom-p-a" @click="setOrCancelTop(item.id)" v-has="'quiz:detail:topOrCancel'">{{ $t('businessSupport.questionAnswer.cancelTop') }}</a>
               <!--  删除 : 发帖人、评论人、有置顶权限的用户可以删除 ?? -->
-              <a v-if="userInfo.id === model.userId || userInfo.id === item.userId" v-has="'quiz:detail:deleteAnswer'" class="right-bottom-p-a" @click="deleteAnswer(item.id)">{{ $t('delete') }}</a>
+              <!--<a v-if="userInfo.id === model.userId || userInfo.id === item.userId || isHasPermission('quiz:detail:topOrCancel')" v-has="'quiz:detail:deleteAnswer'" class="right-bottom-p-a" @click="deleteAnswer(item.id)">{{ $t('delete') }}</a>-->
             </template>
             <!--  非置顶评论  -->
             <template v-else>
               <!--  设置为置顶  -->
               <a class="right-bottom-p-a" @click="setOrCancelTop(item.id)" v-has="'quiz:detail:topOrCancel'">{{ $t('businessSupport.questionAnswer.setTop') }}</a>
-              <!--  删除 : 发帖人、评论人、有置顶权限的用户可以删除,置顶的评论不允许删除，取消置顶后允许删除 ?? -->
-              <a v-if="userInfo.id === model.userId || userInfo.id === item.userId" v-has="'quiz:detail:deleteAnswer'" class="right-bottom-p-a" @click="deleteAnswer(item.id)">{{ $t('delete') }}</a>
+              <!--  删除 : 发帖人、评论人、有置顶权限的用户可以删除,置顶的评论不允许删除，取消置顶后允许删除 -->
+              <a v-if="userInfo.id === model.userId || userInfo.id === item.userId || isHasPermission('quiz:detail:topOrCancel')" v-has="'quiz:detail:deleteAnswer'" class="right-bottom-p-a" @click="deleteAnswer(item.id)">{{ $t('delete') }}</a>
             </template>
           </p>
         </div>
@@ -88,7 +88,7 @@
     <div v-if="canAnswer === 1" class="answer-form-wrapper">
       <div class="answer-form-wrapper-title">
         <a-avatar shape="square" :size="28" :src="getAvatarView(currentUser.avatar)" icon="user"/>
-        <p class="user-name">{{ currentUser.realname }}({{ currentUser.username }}) {{ currentUser.departIds_dicText }}</p>
+        <p class="user-name">{{ currentUser.departIds_dicText || '' }} {{ currentUser.realname }}({{ currentUser.username }})</p>
         <p class="answer_question">{{ $t('businessSupport.questionAnswer.answerQuestion') }}</p>
       </div>
       <a-textarea v-model="answerDesc" :autoSize="{minRows: 4}" :maxLength="2000"></a-textarea>
@@ -124,6 +124,7 @@ import { getFileInfo } from '@/api/api'
 import { previewPdf } from '@/utils/previewPdf'
 import InternalDetailPage from '@/components/InternalDetailPage'
 import { kkFilePreview } from '@/utils/kkFilePreview'
+import { isHasPermission } from '@/utils/hasPermission'
 
 // 支持预览的文件后缀
 const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx']
@@ -166,6 +167,7 @@ export default {
     }
   },
   methods: {
+    isHasPermission,
     // 初始化获取数据信息
     initData (id) {
       this.loading = true