调整结果

src/apps/AppMessageNotification/AppMessageNotification.vue

@@ -152,22 +152,21 @@ export default {
         let {kind, id, tagIdList} = e
         console.log([result[e.corpId], {kind, id}].flat())
         result[e.corpId] = [result[e.corpId], {kind, id}].flat()
+        tagIdList = tagIdList.map(e => e.id).filter(e => !!e)
         if (tagIdList) {
-          tags[e.corpId] = [tags[e.corpId], {tagIdList}].flat()
+          tags[e.corpId] = [...new Set([tags[e.corpId], tagIdList].flat())]
         }
       })
-
       console.log(result, tags)
-
       var deptList = Object.keys(result).map(corpId => {
         let res
         if (result[corpId]) {
           res = {
             corpId,
-            objList: result[corpId]
+            objList: result[corpId].filter(e => !!e)
           }
-          if (tags[corpId]?.tagIdList) {
+          if (tags[corpId]?.length > 0) {
-            res.tagId = tags[corpId]?.tagIdList
+            res.tagId = tags[corpId]
           }
         }
         return res
@@ -252,27 +251,33 @@ export default {
 .AppMessageNotification {
   height: 100%;
   background-color: #f3f6f9;
+
   .fw500 {
     font-weight: 500;
     font-size: 32px !important;
   }
+
   .color-666 {
     color: #666;
     font-size: 30px;
   }
+
   .tips {
     font-size: 34px;
     color: #f46 !important;
     vertical-align: middle;
   }
+
   .mar-b32 {
     margin-bottom: 32px;
   }
+
   .header {
     // background-color: #fff;
     padding: 32px 32px 20px 32px;
     box-sizing: border-box;
     margin-bottom: 16px;
+
     p {
       line-height: 44px;
       margin-bottom: 8px;
@@ -281,6 +286,7 @@ export default {
       color: #666;
     }
   }
+
   .select-user {
     background-color: #fff;
     padding: 34px 32px;
@@ -288,51 +294,63 @@ export default {
     justify-content: space-between;
     margin-bottom: 16px;
     font-size: 30px;
+
     img {
       width: 44px;
       height: 44px;
       vertical-align: middle;
     }
+
     .color-999 {
       color: #999;
     }
+
     .color-1365DD {
       color: #1365DD;
     }
+
     .label {
       width: 160px;
     }
+
     .right {
       width: calc(100% - 160px);
       text-align: right;
     }
   }
+
   .pad-lr0 {
     padding: 0;
     margin-bottom: 32px;
   }
+
   .content {
     padding: 32px;
     box-sizing: border-box;
     background-color: #fff;
+
     .title {
       line-height: 44px;
       margin-bottom: 24px;
     }
+
     .mini-title {
       line-height: 44px;
       margin-bottom: 24px;
     }
+
     .textarea {
       padding: 16px 32px;
       box-sizing: border-box;
       border: 1px solid #ddd;
+
       .hint {
         padding: 4px 0 8px 0;
         text-align: right;
         color: #999;
       }
     }
+
     // .upload{
     //   padding: 16px 32px;
     //   line-height: 44px;
@@ -344,13 +362,16 @@ export default {
     // }
     .type {
       margin-top: 32px;
+
       p {
         display: inline-block;
         margin-right: 16px;
       }
     }
+
     .type-content {
       margin-top: 32px;
+
       .label {
         display: inline-block;
         margin-right: 16px;
@@ -359,21 +380,26 @@ export default {
         color: #666;
         width: 130px;
       }
+
       .value {
         width: calc(100% - 130px);
       }
+
       .ai-uploader {
         display: inline-block;
         width: calc(100% - 130px);
       }
+
       .flex {
         padding: 34px 0;
         line-height: 44px;
         display: flex;
       }
+
       .border-b {
         border-bottom: 1px solid #ddd;
       }
+
       .flex-label {
         .label {
           width: 260px;
@@ -381,9 +407,11 @@ export default {
       }
     }
   }
+
   .bg-144 {
     height: 144px;
   }
+
   .footer {
     position: fixed;
     bottom: 0;
@@ -395,24 +423,29 @@ export default {
     display: flex;
     font-size: 36px;
     font-family: PingFangSC-Regular, PingFang SC;
+
     .confirm {
       color: #fff;
       background: #1365dd;
     }
+
     div {
       flex: 1;
       text-align: center;
       color: #333;
     }
   }
+
   .popup {
     padding-top: 32px;
     background-color: #f3f6f9;
+
     .item {
       display: inline-block;
       width: 25%;
       text-align: center;
       padding: 32px 0;
+
       .icon-bg {
         width: 100px;
         height: 100px;
@@ -422,10 +455,12 @@ export default {
         margin: 0 auto;
         border-radius: 8px;
         margin-bottom: 16px;
+
         .u-icon {
           margin-top: 20px;
         }
       }
+
       p {
         line-height: 44px;
         font-size: 30px;