Merge branch 'wangtao-oa' of uskycloud/usky-web-mobile into master

src/api/system/user.js

@@ -92,7 +92,7 @@ export function getPageAuthorization(data) {
   })
 }
 
-// 查询部门列表
+// 查询部门列表(权限隔离)
 export function listDept(query) {
   return request({
       url: '/system/dept/list',
@@ -100,6 +100,14 @@ export function listDept(query) {
       params: query
   })
 }
+// 查询部门列表(无权限隔离)
+export function listDeptNoAuth(query) {
+  return request({
+      url: '/system/dept/deptList',
+      method: 'get',
+      params: query
+  })
+}
 // 查询用户所属企业
 export function getTenantByUser(params) {
   return request({

src/pages/business/common/projectMange/statistics/dailyReport.vue

@@ -68,7 +68,7 @@
   import { ref, getCurrentInstance, reactive } from "vue";
   /*----------------------------------接口引入-----------------------------------*/
   import { projectApi } from "@/api/business/project.js";
-  import { listDept } from "@/api/system/user";
+  import { listDeptNoAuth } from "@/api/system/user";
   // import dayjs from 'dayjs/esm/index'
   /*----------------------------------组件引入-----------------------------------*/
   /*----------------------------------store引入-----------------------------------*/
@@ -159,7 +159,7 @@
         reportList.value = res.data.records[0];
         total.value = res.data.total;
         var deptItem = []
-        listDept().then((res)=>{//部门名称
+        listDeptNoAuth().then((res)=>{//部门名称
           deptItem = res.data
           for(let i=0;i<reportList.value.length;i++){
             reportList.value[i].deptName = deptItem.find(item => item.deptId == reportList.value[i].deptId).deptName

src/pages/index.vue

@@ -156,9 +156,8 @@ function getTenantList(id){
   })
 }
 function changeTenantId(){
-  // console.log(tenantIdChange.value,12)
-  if(useStore.userName && useStore.userId){
-
+  if(useStore.userName && useStore.password){
+    
   }
 }
 /**