From 00b3535a14b5fff1faf5c76204bc822593bdc400 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 17 Jun 2022 09:35:56 +0800
Subject: [PATCH 1/2] BUG 30269

---
 src/project/police/AppMessageNotification/selectDeptUser.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/project/police/AppMessageNotification/selectDeptUser.vue b/src/project/police/AppMessageNotification/selectDeptUser.vue
index 2a37efb3..d1e21678 100644
--- a/src/project/police/AppMessageNotification/selectDeptUser.vue
+++ b/src/project/police/AppMessageNotification/selectDeptUser.vue
@@ -54,7 +54,7 @@ export default {
     }
   },
   onLoad() {
-    this.selected = this.$route.query.selected?.map(id => ({id})) || []
+    this.selected = [this.$route.query.selected].flat().filter(e => !!e)?.map(id => ({id})) || []
     this.getAllDepts()
   },
   methods: {

From 45d4661d9634bf096abc45eb3b85933d6090ee39 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 17 Jun 2022 09:51:43 +0800
Subject: [PATCH 2/2] BUG 30271

---
 src/project/police/AppMessageNotification/chooseUser.vue    | 6 ------
 .../police/AppMessageNotification/selectDeptUser.vue        | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/project/police/AppMessageNotification/chooseUser.vue b/src/project/police/AppMessageNotification/chooseUser.vue
index 914363d0..30cb2bd7 100644
--- a/src/project/police/AppMessageNotification/chooseUser.vue
+++ b/src/project/police/AppMessageNotification/chooseUser.vue
@@ -68,9 +68,6 @@ export default {
     }
   },
   methods: {
-    toSelectDept() {
-      uni.navigateTo({url: `./selectDeptUser`})
-    },
     getTagList() {
       this.$http.post("/app/wxcp/wxcorptag/listAll?size=100").then(res => {
         if (res?.code == 0) {
@@ -116,9 +113,6 @@ export default {
       })
       uni.navigateBack({})
     },
-    toSelectDept() {
-      uni.navigateTo({url: `./selectDept`})
-    },
   },
   onShow() {
     document.title = '人员选择'
diff --git a/src/project/police/AppMessageNotification/selectDeptUser.vue b/src/project/police/AppMessageNotification/selectDeptUser.vue
index d1e21678..1d33eb9d 100644
--- a/src/project/police/AppMessageNotification/selectDeptUser.vue
+++ b/src/project/police/AppMessageNotification/selectDeptUser.vue
@@ -54,7 +54,7 @@ export default {
     }
   },
   onLoad() {
-    this.selected = [this.$route.query.selected].flat().filter(e => !!e)?.map(id => ({id})) || []
+    this.selected = [this.$route.query.selected].flat().filter(e => !!e)?.map(id => ({id, kind: /^\d{1,5}}$/.test(id) ? 'dept' : 'user'})) || []
     this.getAllDepts()
   },
   methods: {