Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

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 = '人员选择'

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, kind: /^\d{1,5}}$/.test(id) ? 'dept' : 'user'})) || []
     this.getAllDepts()
   },
   methods: {