Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web

src/store/modules/user/index.ts

@@ -81,7 +81,13 @@ const useUserStore = defineStore('user', {
         this.name=res.data.userName
      
         if(res.data?.roles.length>0)
-            this.resources=res.data.roles[0].resources;
+          //遍历roles
+          for (const r of res.data.roles) {
+            if (!(this.resources)) {
+              this.resources = [];
+            }
+            this.resources = this.resources.concat(r.resources);
+          }
             setUserInfo(JSON.stringify(userInfo));
             setUserResources(JSON.stringify(this.resources))
         for (const r of this.resources) {

src/views/authority/users/index.vue

@@ -499,11 +499,13 @@
           uuu = res.data;
         });
       }
-      deptvisible.value = true;
-      checkedKeys.value = [];
-      expandKdys.value = [];
-      checkStrictly.value = [];
-      selectUser.value = uuu;
+      if (uuu.dept?false:true) {
+        deptvisible.value = true;
+        checkedKeys.value = [];
+        expandKdys.value = [];
+        checkStrictly.value = [];
+        selectUser.value = uuu;
+      }
     }
   };
   const editHandleOk = () => {

src/views/dmx/knowledgeLib/config.vue

@@ -362,7 +362,7 @@ const changekbObj = (value) => {
       description: kbObj.description,
       language: "English",
       permission: kbObj.permission,
-      embd_id: props.kbtenantInfo.embd_id || kbObj.embd_id,
+      embd_id: kbObj.embd_id || props.kbtenantInfo.embd_id,
       parser_id: kbObj.parser_id,
       layout_recognize: true,
     }

src/views/sessionManager/index.vue

@@ -766,8 +766,6 @@
   };
 
   const selectFileCallback = (data) => {
-    // debugger;
-    // console.log(data, 'selectFileCallback');
     uploaditemList.value = [...uploaditemList.value, ...data];
   };