处理web-求职人员、企业新增时bug

处理app-查询当前登录人所属驿站，所属县区bug

h5app/src/router/index.ts

@@ -77,10 +77,6 @@ const routes: Array<RouteRecordRaw> = [
                 path: 'tabMain/company/detail',
                 component: () => import('@/views/pages/company/detail.vue')
             },
-            {
-                path: 'tabMain/company/menu',
-                component: () => import('@/views/pages/company/menu.vue')
-            },
             {
                 path: 'tabMain/company/edit',
                 component: () => import('@/views/pages/company/edit.vue')

h5app/src/views/pages/company/detail.vue

@@ -48,12 +48,11 @@
 </template>
 <script lang="ts">
 import {defineComponent, ref, reactive, watch, toRefs} from "vue";
-import {getCompanyById} from "@/api/company";
 import {useRoute, useRouter} from "vue-router";
+import {getCompanyById} from "@/api/company";
 import {onIonViewDidEnter} from "@ionic/vue";
 import {arrowBackOutline} from 'ionicons/icons';
 
-
 interface FormData{
   dataModel:any
 }
@@ -77,27 +76,22 @@ export default defineComponent({
       router.push({path: pathValue, query: {reload:1,id:formData.dataModel.companyID,status:statusValue}});
     };
 
-    const loadData = async (companyID:any)=>{
+    const loadData = async (companyID:any,loginUserID:any)=>{
       loading.value = true;
-      const reqData = await getCompanyById(companyID,"60ea0d5b-a75c-11ed-a6c5-7085c2a9999e");
+      const reqData = await getCompanyById(companyID,loginUserID);
       formData.dataModel = reqData;
       console.log("dataModel",formData.dataModel);
       loading.value = false;
     };
 
-    const reload = (companyID:any) => {
-      loadData(companyID);
+    const reload = (companyID:any,loginUserID:any) => {
+      loadData(companyID,loginUserID);
     };
 
-    watch(() => route.query, () => {
-      if (route.query.reload) {
-        reload(route.query.id);
-      }
-    });
 
     onIonViewDidEnter(() => {
       if (route.query.reload) {
-        reload(route.query.id)
+        reload(route.query.id,route.query.loginUserID)
       }
     });
 
@@ -112,10 +106,6 @@ export default defineComponent({
       loadData,
       router,
     }
-  },
-  mounted() {
-    const companyID = this.route.query.id;
-    this.loadData(companyID);
   }
 });
 </script>

h5app/src/views/pages/company/edit.vue

@@ -202,11 +202,11 @@
   </ion-page>
 </template>
 <script lang="ts">
-import {defineComponent, ref, reactive, computed, toRefs} from "vue";
 import {chevronDownOutline, chevronUpOutline, arrowBackOutline} from 'ionicons/icons';
-import {getRegionList, getSiteList, getStreeList} from '@/api/company/index';
+import {defineComponent, ref, reactive, computed, toRefs} from "vue";
 import {useRoute,useRouter} from "vue-router";
-import {alertController, IonIcon, onIonViewDidEnter} from "@ionic/vue";
+import {getRegionList, getSiteList, getStreeList} from '@/api/company/index';
+import {alertController, onIonViewDidEnter} from "@ionic/vue";
 import {useVuelidate} from "@vuelidate/core";
 import {getCompanyById,saveCompanyInfo} from "@/api/company";
 import {required} from "@vuelidate/validators";
@@ -231,7 +231,6 @@ export default defineComponent({
       name:"",
       statusVal: 1
     });
-    const isAdd = ref<any>(true);
     const isShow = ref<any>(false);
     const isLongDate = ref<any>(false);
     const formState = reactive({
@@ -441,14 +440,12 @@ export default defineComponent({
         getStreetListData(formState.dataModel.regionCode);
     }
 
-    const loadData = async (companyID: any,status:any) => {
+    const loadData = async (companyID: any,status:any,loginUserId:any) => {
       curStepData.value.statusVal = status;
-      isAdd.value = companyID == null;
-      const reqData = await getCompanyById(companyID,"60ea0d5b-a75c-11ed-a6c5-7085c2a9999e");
+      const reqData = await getCompanyById(companyID,loginUserId);
       formState.dataModel = reqData;
       isLongDate.value = formState.dataModel.validDate == "2099-12-31T00:00:00.000+08:00";
       console.log('dataModel',formState.dataModel);
-      console.log('isAdd',isAdd.value);
       if(formState.dataModel.regionCode!=null) getStreetListData(formState.dataModel.regionCode);
     };
 
@@ -458,15 +455,14 @@ export default defineComponent({
       }
     });*/
 
-    const reload = (companyID:any,status:any) => {
-      isAdd.value = true;
+    const reload = (companyID:any,status:any,loginUserId:any) => {
       isShow.value = false;
-      loadData(companyID,status);
+      loadData(companyID,status,loginUserId);
     }
 
     onIonViewDidEnter(() => {
       if (route.query.reload) {
-        reload(route.query.id,route.query.status);
+        reload(route.query.id,route.query.status,route.query.loginUserID);
       }
     });
 

h5app/src/views/pages/company/list.vue

@@ -82,16 +82,15 @@
 </template>
 
 <script lang="ts">
-
+import {buildOutline,trashOutline,arrowBackOutline, addCircleOutline} from 'ionicons/icons';
 import {computed, defineComponent, reactive, ref} from 'vue';
-import dayjs from "dayjs";
 import {useRoute, useRouter} from "vue-router";
-import {arrowBackOutline, ellipse, addCircleOutline} from 'ionicons/icons';
+import {useUserStore} from '@/store/modules/user';
 import {IonIcon, onIonViewDidEnter} from '@ionic/vue';
 import BEmpty from "@/components/empty.vue";
+import {post} from "@/api/common";
 import {getCompanyList} from '@/api/company/index';
-import {chevronForwardOutline,buildOutline,trashOutline} from 'ionicons/icons';
-import {get, post} from "@/api/common";
+import dayjs from "dayjs";
 
 export default defineComponent({
   name: 'CompanyList',
@@ -99,6 +98,7 @@ export default defineComponent({
   setup() {
     const router = useRouter();
     const route = useRoute();
+    const curUserID = ref("");
     const total = ref(10);
     const loading = ref(true);
     const searchParams = reactive({
@@ -116,6 +116,8 @@ export default defineComponent({
 
     const loadData = async function () {
       loading.value = true;
+      const loginUserInfo = useUserStore().getUserInfo;
+      curUserID.value = loginUserInfo.userID == undefined?"":loginUserInfo.userID;
       getCompanyList(searchParams).then(data => {
         dataList.value = dataList.value.concat(data.list);
         total.value = data.total;
@@ -140,12 +142,7 @@ export default defineComponent({
       }, 500);
     }
 
-    const onAdd = () => {
-      router.push({path: './edit', query: {reload: 1,id: null,status: 1}});
-    }
-    const onEdit = (companyID: string) => {
-      router.push({path: './edit', query: {reload: 1, id: companyID,status: 1}});
-    }
+
     // 信息弹窗内容
     const infoAlterData = reactive({
       title:"",
@@ -211,7 +208,15 @@ export default defineComponent({
       delLoading.value = value;
     }
     const onDetail = (companyID:string) => {
-      router.push({path: './detail', query: {reload: 1,id: companyID}});
+      router.push({path: './detail', query: {reload: 1,id: companyID,loginUserID:curUserID.value}});
+    }
+
+    const onAdd = () => {
+      router.push({path: './edit', query: {reload: 1,id: null,status: 1,loginUserID:curUserID.value}});
+    }
+
+    const onEdit = (companyID: string) => {
+      router.push({path: './edit', query: {reload: 1, id: companyID,status: 1,loginUserID:curUserID.value}});
     }
 
     const onBack = () => {
@@ -223,10 +228,8 @@ export default defineComponent({
     });
 
     return {
-      ellipse,
       arrowBackOutline,
       addCircleOutline,
-      chevronForwardOutline,
       buildOutline,
       trashOutline,
       router,

h5app/src/views/pages/company/menu.vue

@@ -1,232 +0,0 @@
-<template>
-  <ion-page>
-    <ion-header class="header-theme2">
-      <ion-toolbar>
-        <ion-buttons slot="start">
-          <ion-icon :icon="arrowBackOutline" @click="onBack"></ion-icon>
-        </ion-buttons>
-        <ion-title>
-          企业信息收集
-        </ion-title>
-      </ion-toolbar>
-    </ion-header>
-    <ion-content>
-      <div class="stepFlex">
-        <div v-for="(record,key) in stepList" :key="key" class="stepFlex-item">
-          <div
-              :class="[(record.val < curStepData?.statusVal || curStepData?.statusVal == stepList[stepList.length-1].val) ? 'greenCircle' :record.val == curStepData?.statusVal ? 'now' : 'grayCircle']"></div>
-          <div v-if="key !== stepList.length - 1"
-               :class="[record.val < curStepData?.statusVal ? 'greenLine' : 'grayLine']"></div>
-          <div class="stepFlex-item-label">
-            <p class="stepFlex-item-label-title">{{ record.title }}</p>
-            <p class="stepFlex-item-label-desc">{{ record.desc }}</p>
-          </div>
-        </div>
-      </div>
-      <div>
-        <ion-label style="text-align: center;color:#46b0e0;">
-          <h2 style="font-size: 28px;">
-            {{ dataModel.companyName == null?"":dataModel.companyName }}
-          </h2>
-        </ion-label>
-      </div>
-      <ion-grid>
-        <ion-row class="ion-justify-content-center">
-          <ion-col size="4">
-            <ion-button expand="block" style="display: inline-block; width: 120px;height:45px;font-size: 20px;" @click="onPathForward('./edit',1)">信息维护</ion-button>
-          </ion-col>
-          <ion-col size="4" >
-            <ion-button expand="block" style="display: inline-block; width: 120px;height:45px;font-size: 20px;" @click="onPathForward('./postList',3)">岗位管理</ion-button>
-          </ion-col>
-        </ion-row>
-      </ion-grid>
-    </ion-content>
-    <ion-footer>
-    </ion-footer>
-  </ion-page>
-</template>
-<script lang="ts">
-import {defineComponent, ref, reactive, watch, toRefs} from "vue";
-import {getCompanyById} from "@/api/company";
-import {useRoute, useRouter} from "vue-router";
-import {onIonViewDidEnter} from "@ionic/vue";
-import {arrowBackOutline} from 'ionicons/icons';
-
-interface StepParams{
-  name: string,
-  statusVal: number
-}
-
-interface FormData{
-  dataModel:any
-}
-export default defineComponent({
-  name: 'CompanyMenu',
-  setup() {
-    const router = useRouter();
-    const route = useRoute();
-    const curStepData = ref<StepParams>({
-      name:"",
-      statusVal: 1
-    });
-    const loading = ref<boolean>(false);
-    const formData = reactive<FormData>({
-      dataModel: {
-        companyID:null,
-        companyName:null
-      }
-    });
-    const stepList = ref([
-        {title: '基础信息', desc: '企业基础信息', val: 1},
-        {title: '', desc: '', val: 2},
-        {title: '岗位信息', desc: '企业岗位信息', val: 3}
-    ]);
-
-    const onBack=()=>{
-      router.push({path:'./list',query:{reload:1}});
-    };
-
-    const onPathForward = (pathValue:string,statusValue:any)=>{
-      router.push({path: pathValue, query: {reload:1,id:formData.dataModel.companyID,status:statusValue}});
-    };
-
-    const loadData = async (companyID:any,status:any)=>{
-      loading.value = true;
-      curStepData.value.statusVal = status;
-      console.log(companyID);
-      const reqData = await getCompanyById(companyID,"60ea0d5b-a75c-11ed-a6c5-7085c2a9999e");
-      formData.dataModel = reqData;
-      console.log("dataModel",formData.dataModel);
-      loading.value = false;
-    };
-
-    const reload = (companyID:any,status:any) => {
-      loadData(companyID,status);
-    };
-
-    watch(() => route.query, () => {
-      if (route.query.reload) {
-        reload(route.query.id,route.query.status);
-      }
-    });
-
-    onIonViewDidEnter(() => {
-      if (route.query.reload) {
-        reload(route.query.id,route.query.status)
-      }
-    });
-
-
-    return {
-      ...toRefs(formData),
-      arrowBackOutline,
-      route,
-      loading,
-      stepList,
-      curStepData,
-      onPathForward,
-      onBack,
-      loadData,
-      router,
-    }
-  },
-  mounted() {
-    const companyID = this.route.query.id;
-    const status = this.route.query.status;
-    this.loadData(companyID,status);
-  }
-});
-</script>
-
-<style lang="less">
-ion-item {
-  --border-width: 0;
-  --border-style: none;
-
-  ion-label, ion-input, ion-select, ion-datetime-button {
-    font-size: 14px !important;
-  }
-}
-
-.stepFlex {
-  margin: 0;
-  display: flex;
-  width: 100%;
-
-  .stepFlex-item {
-    position: relative;
-    flex: 1;
-    text-align: center;
-    margin-top: -10px;
-
-    .stepFlex-item-label {
-      padding-top: 60px;
-      font-size: 14px;
-
-      .stepFlex-item-label-title {
-        margin-top: 30px;
-      }
-
-      .stepFlex-item-label-desc {
-        margin-top: 5px;
-        color: #b9b9bd;
-      }
-    }
-  }
-
-  .greenCircle {
-    top: calc(50% - 15px);
-    left: calc(50% - 4px);
-    position: absolute;
-    z-index: 2;
-    width: 10px;
-    height: 10px;
-    border-radius: 50%;
-    background-color: #31A2FE;
-  }
-
-  .now {
-    top: calc(50% - 18px);
-    left: calc(50% - 8px);
-    position: absolute;
-    z-index: 3;
-    width: 16px;
-    height: 16px;
-    border-radius: 50%;
-    background-color: #31A2FE;
-    border: 4px solid #c5e8f9;
-  }
-
-  .grayCircle {
-    top: calc(50% - 15px);
-    left: calc(50% - 4px);
-    position: absolute;
-    z-index: 2;
-    width: 10px;
-    height: 10px;
-    border-radius: 50%;
-    background-color: #ccc;
-  }
-
-  .greenLine {
-    width: 100%;
-    top: calc(50% - 11px);
-    left: calc(50% - 2px);
-    height: 2px;
-    background-color: #31A2FE;
-    position: absolute;
-  }
-
-  .grayLine {
-    height: 0;
-    border: 1px dashed #ccc;
-    width: 100%;
-    top: calc(50% - 11px);
-    left: calc(50% - 2px);
-    position: absolute;
-  }
-
-}
-
-
-</style>

h5app/src/views/pages/jobhunt/detail.vue

@@ -43,7 +43,7 @@
   </ion-page>
 </template>
 <script lang="ts">
-import {defineComponent, ref, reactive, watch, toRefs} from "vue";
+import {defineComponent, ref, reactive, toRefs} from "vue";
 import {getJobUserById} from "@/api/jobUserInfo";
 import {useRoute, useRouter} from "vue-router";
 import {onIonViewDidEnter} from "@ionic/vue";
@@ -67,28 +67,21 @@ export default defineComponent({
       router.push({path:'./list',query:{reload:1}});
     };
 
-
-    const loadData = async (jobUserID:any)=>{
+    const loadData = async (jobUserID:any,loginUserId:any)=>{
       loading.value = true;
-      const reqData = await getJobUserById(jobUserID,"60ea0d5b-a75c-11ed-a6c5-7085c2a9999e");
+      const reqData = await getJobUserById(jobUserID,loginUserId);
       formData.dataModel = reqData;
       console.log("dataModel",formData.dataModel);
       loading.value = false;
     };
 
-    const reload = (jobUserID:any) => {
-      loadData(jobUserID);
+    const reload = (jobUserID:any,loginUserID:any) => {
+      loadData(jobUserID,loginUserID);
     };
 
-    watch(() => route.query, () => {
-      if (route.query.reload) {
-        reload(route.query.id);
-      }
-    });
-
     onIonViewDidEnter(() => {
       if (route.query.reload) {
-        reload(route.query.id)
+        reload(route.query.id,route.query.loginUserID)
       }
     });
 
@@ -102,10 +95,6 @@ export default defineComponent({
       loadData,
       router,
     }
-  },
-  mounted() {
-    const companyID = this.route.query.id;
-    this.loadData(companyID);
   }
 });
 </script>

h5app/src/views/pages/jobhunt/edit.vue

@@ -381,6 +381,7 @@
 <script lang="ts">
 import {chevronDownOutline, chevronUpOutline,arrowBackOutline,addCircleOutline,trashOutline} from 'ionicons/icons';
 import {reactive,defineComponent, computed,watch,ref,toRefs} from "vue";
+import {post} from "@/api/common";
 import {useRoute, useRouter} from "vue-router";
 import {required} from "@vuelidate/validators";
 import {useVuelidate} from "@vuelidate/core";
@@ -393,7 +394,7 @@ import {getSiteDataList} from "@/api/siteInfo";
 import {getSysDictionaryList} from '@/api/system/dictionary';
 import {alertController, onIonViewDidEnter} from "@ionic/vue";
 import dayjs from "dayjs";
-import {post} from "@/api/common";
+import {useUserStore} from "@/store/modules/user";
 
 interface SelectProps {
   name: string,
@@ -408,6 +409,8 @@ export default defineComponent({
   setup() {
     const router = useRouter();
     const route = useRoute();
+    const loginUserInfo = useUserStore().getUserInfo;
+    const curUserID = loginUserInfo.userID == undefined?"":loginUserInfo.userID;
     const isAllowCommit = ref(true);
     const expand = ref<boolean>(false);
     const loading = ref(true);
@@ -708,30 +711,30 @@ export default defineComponent({
       pageParams.jobUserID = jobUserID;
       baseInfoData.baseData.jobUserID = jobUserID;
       curStepData.value.statusVal = status;
-      console.log("当前jobUserID",jobUserID);
+      //console.log("当前jobUserID",jobUserID);
       if(curStepData.value.statusVal==1){
-        const reqData = await getJobUserById(jobUserID,"60ea0d5b-a75c-11ed-a6c5-7085c2a9999e");
+        const reqData = await getJobUserById(jobUserID,curUserID);
         baseInfoData.baseData = reqData;
-        console.log('baseData',baseInfoData.baseData);
+        //console.log('baseData',baseInfoData.baseData);
         await getStreetList();
       }
       else if(curStepData.value.statusVal==2){
         const reqData :any = await getEducationListByJobUserID(pageParams);
         educationList.value = reqData.list;
         pageParams.total = reqData.total;
-        console.log("educationList",educationList.value);
+        //console.log("educationList",educationList.value);
       }
       else if(curStepData.value.statusVal==3){
         const reqData = await getExperienceListByJobUserID(pageParams);
         experienceList.value= reqData.list;
         pageParams.total = reqData.total;
-        console.log("experienceList",experienceList.value);
+        //console.log("experienceList",experienceList.value);
       }
       else if(curStepData.value.statusVal==4){
         const reqData = await getJobHuntListByJobUserID(pageParams);
         jobHuntList.value= reqData.list;
         pageParams.total = reqData.total;
-        console.log("jobHuntList",jobHuntList.value);
+        //console.log("jobHuntList",jobHuntList.value);
       }
       loading.value = false;
     };

h5app/src/views/pages/jobhunt/list.vue

@@ -82,20 +82,21 @@
 </template>
 
 <script lang="ts">
+import {arrowBackOutline,addCircleOutline,chevronForwardOutline,buildOutline,trashOutline} from 'ionicons/icons';
 import {useRouter} from "vue-router";
 import {computed, defineComponent, reactive, ref} from 'vue';
-import {arrowBackOutline,addCircleOutline} from 'ionicons/icons';
-import {chevronForwardOutline,buildOutline,trashOutline} from 'ionicons/icons';
 import {IonIcon, onIonViewDidEnter} from '@ionic/vue';
 import {getJobUserList} from "@/api/jobUserInfo";
 import {getJobHuntListByJobUserID} from "@/api/jobHuntInfo";
 import {post} from "@/api/common";
+import {useUserStore} from "@/store/modules/user";
 
 export default defineComponent({
   name: 'jobUserList',
   components: {IonIcon},
   setup() {
     const router = useRouter();
+    const curUserID = ref("");
     const total = ref(10);
     const loading = ref(true);
     const pagination = computed(() => ({
@@ -129,6 +130,8 @@ export default defineComponent({
     }
     const loadData = async function () {
       loading.value = true;
+      const loginUserInfo = useUserStore().getUserInfo;
+      curUserID.value = loginUserInfo.userID == undefined?"":loginUserInfo.userID;
       getJobUserList(searchParams).then(data=>{
         dataList.value = dataList.value.concat(data.list);
         (dataList.value as any[]).map(item=>{
@@ -161,9 +164,7 @@ export default defineComponent({
       }, 500);
     }
 
-    const onAdd = () => {
-      router.push({path: './edit', query: {reload:1,jobUserID:null,status:1}});
-    }
+
 
     const onBack =()=>{
       router.push('../');
@@ -233,11 +234,14 @@ export default defineComponent({
       delLoading.value = value;
     }
     const onDetail = (jobUserID: string) => {
-      router.push({path: './detail', query: {reload: 1, id: jobUserID}});
+      router.push({path: './detail', query: {reload: 1, id: jobUserID,loginUserID:curUserID.value}});
     }
     const onEdit = (jobUserID:string) =>{
       router.push({path: './edit', query: {reload:1,jobUserID: jobUserID,status: 1}});
     }
+    const onAdd = () => {
+      router.push({path: './edit', query: {reload:1,jobUserID:null,status:1}});
+    }
 
     onIonViewDidEnter(() => {
       reload();

h5app/src/views/pages/post/detail.vue

@@ -93,12 +93,13 @@
 </template>
 <script lang="ts">
 import {arrowBackOutline,addCircleOutline} from 'ionicons/icons';
-import {reactive,defineComponent,watch,ref,toRefs} from "vue";
+import {reactive,defineComponent,ref} from "vue";
 import {useRoute, useRouter} from "vue-router";
 import {getJobUserById,getUserHuntList} from "@/api/jobUserInfo";
 import {getCommendPostList,saveCommendPost,saveCommendPostList} from "@/api/post";
 import {alertController, onIonViewDidEnter} from "@ionic/vue";
 import dayjs from "dayjs";
+import {useUserStore} from "@/store/modules/user";
 
 interface SelectProps {
   name: string,
@@ -132,6 +133,7 @@ export default defineComponent({
   setup() {
     const router = useRouter();
     const route = useRoute();
+    const curUserID = ref("");
     const editForm = ref();
     const commendStr = ref("推荐");
     const dataModel = ref<UserInfoModel>({
@@ -240,7 +242,9 @@ export default defineComponent({
       formStatus.loading = true;
       recommendPostList.value = [];
       /*查询求职人员信息*/
-      const userInfo :any = await getJobUserById(jobUserID,"60ea0d5b-a75c-11ed-a6c5-7085c2a9999e");
+      const loginUserInfo = useUserStore().getUserInfo;
+      curUserID.value = loginUserInfo.userID == undefined?"":loginUserInfo.userID;
+      const userInfo :any = await getJobUserById(jobUserID,curUserID.value);
       dataModel.value = userInfo;
       /*查询求职意向信息*/
       await getCurHuntList(jobUserID);
@@ -252,11 +256,6 @@ export default defineComponent({
       formStatus.loading = false;
     };
 
-    watch(() => route.query, () => {
-      if (route.query.reload) {
-        loadData(route.query.jobUserID);
-      }
-    });
 
     const reload = (jobUserID:any) => {
       pageParams.pageIndex = 1;

vue/src/api/companyService/company.ts

@@ -14,11 +14,11 @@ export function getList(params: any) {
   );
 }
 
-export function getCompanyById(id: string) {
+export function getCompanyById(id: string,loginUserID:string) {
   return request({
     url: 'companyService/company/getCompanyByID',
     method: 'get',
-    params: {id}
+    params: {id,loginUserID}
   }, {
     isNew: true
   })

vue/src/api/jobUserManager/jobuser/index.ts

@@ -23,12 +23,12 @@ export function getJobUserDataList(){
   );
 }
 
-export function getDataById(id: any) {
+export function getDataById(id: any,loginUserID:any) {
   return request(
     {
       url: 'jobUserService/jobUser/getDataByID',
       method: 'get',
-      params: {id},
+      params: {id,loginUserID},
     },
     { isNew: true },
   );

vue/src/views/companyService/company/edit.vue

@@ -290,6 +290,7 @@ import {getRegionCodeList, getStreetCodeList} from "@/api/system/area/index";
 import {save, getCompanyById} from '@/api/companyService/company';
 import {getSiteByID, getSiteList} from '@/api/baseSettings/siteInfo';
 import {getSysDictionaryList} from '@/api/system/dictionary';
+import {getInfo} from '@/api/account';
 import dayjs from "dayjs";
 import {message} from "ant-design-vue";
 
@@ -454,15 +455,19 @@ export default defineComponent(
         getRegionList();
         getCompanyModelList();
         getCompanyTypeList();
-        getCompanyById(id).then(result => {
-          formState.dataModel = result;
-          // console.log("curDataModel",formState.dataModel);
-          showPicker.value = formState.dataModel.validDate == '2099-12-31T00:00:00.000+08:00' ? '1' : '2';
-          if (showPicker.value === '1')
-            showDateTime.value = dayjs(new Date().toLocaleDateString().replaceAll("/", "-"));
-          else
-            showDateTime.value = formState.dataModel.validDate;
-        })
+        getInfo().then((loginUserInfo:any)=>{
+          console.log("userInfo",loginUserInfo.userID);
+          getCompanyById(id,loginUserInfo.userID).then(result => {
+            formState.dataModel = result;
+            // console.log("curDataModel",formState.dataModel);
+            showPicker.value = formState.dataModel.validDate == '2099-12-31T00:00:00.000+08:00' ? '1' : '2';
+            if (showPicker.value === '1')
+              showDateTime.value = dayjs(new Date().toLocaleDateString().replaceAll("/", "-"));
+            else
+              showDateTime.value = formState.dataModel.validDate;
+          })
+        });
+
       };
 
       return {

vue/src/views/jobUserManager/jobuser/edit.vue

@@ -454,6 +454,7 @@ import {get} from "@/api/common";
 import {getSysDictionaryList} from '@/api/system/dictionary';
 import {getDataById, getEducationList, getExperienceList, save} from '@/api/jobUserManager/jobuser';
 import {getSiteList} from "@/api/baseSettings/siteInfo";
+import {getInfo} from "@/api/account";
 
 interface FormState {
   dataModel: any;
@@ -748,11 +749,13 @@ export default defineComponent(
         getKeyPersonTypeList();
         getMaritalStatusList();
         getPoliticsStatusList();
-        getDataById(id).then(data => {
-          formState.dataModel = data;
-          if (formState.dataModel.regionCode) {
-            changeCity();
-          }
+        getInfo().then((loginUserInfo:any)=>{
+          getDataById(id,loginUserInfo.userID).then(data => {
+            formState.dataModel = data;
+            if (formState.dataModel.regionCode) {
+              changeCity();
+            }
+          });
         });
       };