Merge remote-tracking branch 'origin/master'

sample-form-client-ui/admin/src/App.vue

@@ -135,7 +135,9 @@ export default {
       let res = await getHomeInfo({});
       let { data, code } = res.data;
       if (code === 1) {
-        data.hotWords = data.hotWords.map((v) => v.hotwords);
+        data.hotWords = data.hotWords
+          .filter((v) => v.hotwords)
+          .map((v) => v.hotwords);
         this.homeInfo = data;
         this.SET_homeInfo(data);
         let datumList = [];

sample-form-manager-ui/admin/src/pages/software/basics/BasicsSet.vue

@@ -99,10 +99,9 @@ export default {
       if (res.data.code === 1) {
         this.newSourceEnumData = res.data.dict.newsSource;
         if (res.data.data.data.length > 0) {
-          this.baseSetInfo.hotwords = res.data.data.data[0].hotwordList.slice(
-            0,
-            10
-          );
+          this.baseSetInfo.hotwords = res.data.data.data[0].hotwordList
+            .filter((v) => v.hotwords)
+            .slice(0, 10);
           this.baseSetInfo.printDisplay = res.data.data.data[0].printDisplay;
           this.baseSetInfo.newsSource = res.data.data.data[0].newsSource + "";
         }