Merge branch 'develop' into release-test

@@ -428,7 +428,7 @@ export const getApiDetail = (params) => request({
   method: 'get',
 })
 
-// 跨服务掉加工交付接口 获取API调用次数
+// 跨服务调加工交付接口 获取API调用次数
 export const getApiInvokeCount = (data) => request({
   // url: `http://localhost:9000/delivery/ms-daop-jgjf-data-open-service/home-page/dam/call-api-stat`,
   url: `https://daop-zcgl-test.zgsjzc.com/delivery/api/ms-daop-jgjf-data-open-service/home-page/dam/call-api-stat`,

@@ -6,6 +6,7 @@ import {
   getApiDetail,
   apiTypes,
 } from "@/api/modules/dataAsset";
+import useUserStore from "@/store/modules/user";
 const route = useRoute();
 const { proxy } = getCurrentInstance() as any;
 const router = useRouter();
@@ -27,12 +28,14 @@ const detailInfo: any = ref({});
 const apiType = ref('1');// 单表API.
 const sql = ref('');
 const processDTOSValue = ref([]);
+const userStore = useUserStore();
+const userData = JSON.parse(userStore.userData)
 
 onBeforeMount(() => {
   if (route.query.guid) {
     getDetail();
   } else {
-    getCamundaDeploymentId('10023').then((res: any) => {
+    getCamundaDeploymentId('10023', userData.tenantGuid, userData.staffGuid).then((res: any) => {
       if (res.code == proxy.$passCode) {
         deploymentId.value = res.data;
       } else {

@@ -2076,7 +2076,7 @@ onBeforeMount(() => {
       }
     });
   } else {
-    getCamundaDeploymentId('10016').then((res: any) => {
+    getCamundaDeploymentId('10016', userData.tenantGuid, userData.staffGuid).then((res: any) => {
       if (res.code == proxy.$passCode) {
         deploymentId.value = res.data;
       } else {

@@ -1456,7 +1456,7 @@ onBeforeMount(async () => {
     }
   })
 
-  getCamundaDeploymentId('10016').then((res: any) => {
+  getCamundaDeploymentId('10016', userData.tenantGuid, userData.staffGuid).then((res: any) => {
     if (res.code == proxy.$passCode) {
       deploymentId.value = res.data;
     } else {