From 41810a8b80180eddedfc37af712c914bad14d9e7 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 22 Aug 2022 15:03:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=A3=E5=8F=91=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/wxwork/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue b/packages/wxwork/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue
index 1adc8df9..ab0b97bb 100644
--- a/packages/wxwork/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue
+++ b/packages/wxwork/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue
@@ -269,7 +269,10 @@
         }
       },
       getEffect() {
-        var startTime = this.timeListEffect[0] || '' , endTime = this.timeListEffect[1] || '', departId = this.deptList[0].id || ''
+        var startTime = this.timeListEffect[0] || '' , endTime = this.timeListEffect[1] || '', departId = ''
+        if(this.deptList && this.deptList.length) {
+          departId = this.deptList[0].id
+        }
         this.instance.post(`/app/appmasssendingtask/statisticsEffect?type=${this.effectType}&startTime=${startTime}&endTime=${endTime}&departId=${departId}`).then(res => {
           if (res.code == 0) {
             this.effectData = res.data

From e7fb16bd70686b4bf3cd0699013d287c66872a1d Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 22 Aug 2022 15:24:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/extra/AppAddressBook/components/List.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/extra/AppAddressBook/components/List.vue b/packages/extra/AppAddressBook/components/List.vue
index bfbf0711..96116c98 100644
--- a/packages/extra/AppAddressBook/components/List.vue
+++ b/packages/extra/AppAddressBook/components/List.vue
@@ -235,7 +235,7 @@ export default {
         {prop: 'departmentNames', label: '部门'},
         {prop: 'mobile', label: '手机号'},
         {slot: 'tags', label: '标签'},
-        {prop: 'status', label: '账号状态', align: 'center', formart: v => v === 1 ? '已激活' : '未激活'}
+        {prop: 'status', label: '账号状态', align: 'center', formart: v => v == 1 ? '已激活' : '未激活'}
       ],
       defaultProps: {
         children: 'children',