Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/system/user/index.vue

@@ -583,7 +583,8 @@ export default {
         status: "0",
         remark: undefined,
         postIds: [],
-        roleIds: []
+        roleIds: [],
+        datasourceId:[]
       };
       this.resetForm("form");
     },
@@ -636,6 +637,7 @@ export default {
       const userId = row.userId || this.ids;
       getUser(userId).then(response => {
         this.form = response.data;
+        this.form.datasourceId = response.data?.datasourceId?.split(',');
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
         this.$set(this.form, "postIds", response.postIds);