Merge remote-tracking branch 'origin/develop' into develop

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -3647,6 +3647,7 @@ export default {
               this.$set(this.sarBussionessStandEO, key, item.attrInfoMap[key])
             }
           })
+          this.filterData(this.sarBussionessStandEO["QCDW"]);
           this.sarBussionessStandEO['id'] = item.id
           if (state === 'show') {
             this.formdisableflag = true
@@ -5167,13 +5168,7 @@ export default {
   },
   watch: {
     'sarBussionessStandEO.QCDW'(val) {
-      let arr = val.split(',')
-      arr.forEach((item, index) => {
-        if (item === undefined || item === 'undefined' || item === '') {
-          arr.splice(index, 1)
-        }
-      })
-      return arr.toString()
+      this.filterData(val);
     },
     filterText(val) {
       this.$refs.tree.filter(val);

src/pages/regulatoryRepository/standQA/components/questions-item.vue

@@ -14,7 +14,7 @@
     </div>
     <div class="row">
       <div class="item">
-        <div>{{userName}}
+        <div>{{answer.answerer}}
           <span>{{question.questionTime}}</span>
         </div>
       </div>