Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppMeetingNotice/components/addMeeting.vue

@@ -158,7 +158,11 @@ export default {
   methods: {
     ...mapActions(['selectEnterpriseContact']),
     handleSelectUser() {
-      this.selectEnterpriseContact({fromDepartmentId:0,type:["department", "user"]}).then(res => {
+      this.selectEnterpriseContact({
+        fromDepartmentId:0,
+        type:["department", "user"],
+        selectedUserIds: this.form.attendees?.map(e=>e.id)
+      }).then(res => {
         this.change(res?.userList || [])
       })
     },

src/apps/AppNotification/components/add.vue

@@ -121,8 +121,13 @@
     methods: {
       ...mapActions(['selectEnterpriseContact']),
       handleSelectUser() {
-        this.selectEnterpriseContact({fromDepartmentId:0,type:["department", "user"]}).then(res => {
+        this.selectEnterpriseContact({
+          fromDepartmentId:0,
+          type:["department", "user"],
+          selectedUserIds: this.form.persons?.map(e=>e.id)
+        }).then(res => {
           this.form.persons = res?.userList || []
+          console.log(this.form.persons);
         })
       },
       confirm(e){