Merge branch 'develop' into release-test

@@ -25,10 +25,17 @@ export const refreshToken = (params) => {
   })
   })
 }
 }
 
 
-export const getSystemMenu = (params) => {
+/** 获取登录人员的菜单 */
+export const getSystemMenu = (params, isAdmin) => {
   return request({
   return request({
-    url: `${import.meta.env.VITE_APP_AUTH_URL
-      }/product-menu-permission/tenant/get-product-menu?tenantGuid=${params.tenantGuid}&platformSystemGuid=32774fcfdf5e43e8b866660374d8bced`,
+    url:
+      isAdmin == "Y"
+        ? `${
+            import.meta.env.VITE_APP_AUTH_URL
+          }/product-menu-permission/tenant/get-product-menu?tenantGuid=${params.tenantGuid}&platformSystemGuid=32774fcfdf5e43e8b866660374d8bced`
+        : `${
+            import.meta.env.VITE_APP_AUTH_URL
+          }/product-menu-permission/staff/get-product-menu-template?platformSystemGuid=32774fcfdf5e43e8b866660374d8bced`,
     method: "get",
     method: "get",
   });
   });
 };
 };

@@ -61,7 +61,7 @@ const useUserStore = defineStore(
                   userName.value = res.data.staffName;
                   userName.value = res.data.staffName;
                   localStorage.setItem('userName', res.data?.staffName);
                   localStorage.setItem('userName', res.data?.staffName);
                   localStorage.setItem('userData', JSON.stringify(res.data));
                   localStorage.setItem('userData', JSON.stringify(res.data));
-                  return getSystemMenu({ tenantGuid: currentTenantGuid.value }).then((info: any) => { //解决页面调用流程接口传递staffGuid，为空的问题
+                  return getSystemMenu({ tenantGuid: currentTenantGuid.value }, res.data?.isAdmin).then((info: any) => { //解决页面调用流程接口传递staffGuid，为空的问题
                     if (info.code == '00000') {
                     if (info.code == '00000') {
                       localStorage.setItem('userInfoData', JSON.stringify(info.data));
                       localStorage.setItem('userInfoData', JSON.stringify(info.data));
                       userInfoData.value = info.data;
                       userInfoData.value = info.data;