Merge remote-tracking branch 'origin/master'

h5app/src/api/jobHuntInfo/index.ts

@@ -39,6 +39,7 @@ export function getJobHuntByID(jobHuntID:any){
     );
 }
 
+// 不从token获取创建人
 export function saveJobHunt(data: any) {
     return request(
         {
@@ -53,6 +54,21 @@ export function saveJobHunt(data: any) {
     );
 }
 
+// 从token获取创建人
+export function saveJobHuntCopy(data: any) {
+    return request<object>({
+            url: 'jobUserService/jobHunt/saveJobHunt',
+            method: 'post',
+            data: data,
+        },
+        {
+            isNew: true,
+            successMsg: '提交成功！',
+            errorMsg: '提交失败！'
+        },
+    );
+}
+
 export function deleteJobHuntAndRecommendMgt(id:any) {
     return request<object>(
         {

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

@@ -164,7 +164,7 @@
             <ion-text>{{ dayjs(curCompanyPostInfo.startTime).format("YYYY-MM-DD")+"至"+dayjs(curCompanyPostInfo.endTime).format("YYYY-MM-DD") }}</ion-text>
           </div>
           <div class="form-detail">
-            <ion-label>招聘地点</ion-label>
+            <ion-label>工作地点</ion-label>
             <ion-text>{{ curCompanyPostInfo.jobPlace }}</ion-text>
           </div>
           <div class="form-detail">

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

@@ -71,11 +71,11 @@
           </div>
           <div style="width: 100%;overflow: hidden;"></div>
           <div class="form-input">
-            <ion-label>招聘地点<span class="danger">*</span></ion-label>
-            <ion-textarea placeholder="请输入招聘地点" :rows="3" label-placement="stacked" :clear-input="true"
+            <ion-label>工作地点<span class="danger">*</span></ion-label>
+            <ion-textarea placeholder="请输入工作地点" :rows="3" label-placement="stacked" :clear-input="true"
                        v-model="dataModel.jobPlace" class="custom" style="border-bottom: 1px solid #fff2e8;">
             </ion-textarea>
-              <ion-note v-show="isCommit&&v$.dataModel.jobPlace.$error" class="danger" >请输入招聘地点</ion-note>
+              <ion-note v-show="isCommit&&v$.dataModel.jobPlace.$error" class="danger" >请输入工作地点</ion-note>
           </div>
         </div>
         <div class="bw-vue-form">

h5app/src/views/pages/jobUserInfo/index.vue

@@ -167,11 +167,11 @@ export default defineComponent({
 .user_img {
   .img-list {
     width:100%;
-    padding-left: 125px;
   }
 
   .img-item:first-child,.img-item:first-child img{
     width: 120px;
+    margin:0 auto;
   }
 
   .img-item:not(:first-child){

h5app/src/views/pages/jobUserInfo/postEdit.vue

@@ -73,11 +73,11 @@
           </div>
           <div style="overflow: hidden;width:100%;"></div>
           <div class="form-input">
-            <ion-label>招聘地点<span class="danger">*</span></ion-label>
-            <ion-textarea placeholder="请输入招聘地点" :rows="3" label-placement="stacked" :clear-input="true"
+            <ion-label>工作地点<span class="danger">*</span></ion-label>
+            <ion-textarea placeholder="请输入工作地点" :rows="3" label-placement="stacked" :clear-input="true"
                        v-model="dataModel.jobPlace" class="custom" style="border-bottom: 1px solid #fff2e8;">
             </ion-textarea>
-<!--            <ion-note slot="error">请输入招聘地点</ion-note>-->
+<!--            <ion-note slot="error">请输入工作地点</ion-note>-->
           </div>
           <div class="form-title">
             其他信息

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

@@ -133,7 +133,7 @@ import {reactive,defineComponent, computed,ref,toRefs} from "vue";
 import {useRoute,useRouter} from "vue-router";
 import {required} from "@vuelidate/validators";
 import {useVuelidate} from "@vuelidate/core";
-import {getJobHuntByID,saveJobHunt} from "@/api/jobHuntInfo";
+import {getJobHuntByID, saveJobHunt, saveJobHuntCopy} from "@/api/jobHuntInfo";
 import {getSysDictionaryList} from '@/api/system/dictionary';
 import {alertController, onIonViewDidEnter} from "@ionic/vue";
 import dayjs from "dayjs";
@@ -287,7 +287,7 @@ export default defineComponent({
       }
       ifInputAllValid();
       if(isCommit.value){
-        saveJobHunt(jobHuntData.dataModel).then(result => {
+        saveJobHuntCopy(jobHuntData.dataModel).then(result => {
           if (result) {
             router.push({path: './edit', query: {reload:1,jobUserID: jobHuntData.dataModel.jobUserID,status:4}});
           }

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

@@ -32,7 +32,7 @@
           <ion-text>{{ dayjs(dataModel.startTime).format("YYYY-MM-DD") }} - {{ dayjs(dataModel.endTime).format("YYYY-MM-DD") }}</ion-text>
         </div>
         <div class="form-detail">
-          <ion-label>招聘地点</ion-label>
+          <ion-label>工作地点</ion-label>
           <ion-text>{{ dataModel.jobPlace }}</ion-text>
         </div>
         <div class="form-detail">

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

@@ -75,12 +75,12 @@
             </ion-item>
           </div>
           <div class="form-detail">
-            <ion-label>招聘地点<span class="danger">*</span></ion-label>
+            <ion-label>工作地点<span class="danger">*</span></ion-label>
             <ion-item :class="[v$.dataModel.jobPlace.$error?'ion-invalid':'ion-valid']">
-              <ion-textarea placeholder="请输入招聘地点" :rows="3" label-placement="stacked" :clear-input="true"
+              <ion-textarea placeholder="请输入工作地点" :rows="3" label-placement="stacked" :clear-input="true"
                             v-model="dataModel.jobPlace" class="custom">
               </ion-textarea>
-              <ion-note slot="error">请输入招聘地点</ion-note>
+              <ion-note slot="error">请输入工作地点</ion-note>
             </ion-item>
           </div>
         </div>

src/main/java/com/hz/employmentsite/controller/jobUserManager/JobHuntController.java

@@ -92,15 +92,19 @@ public class JobHuntController {
         String loginUserID = data.loginUserID;
         try {
             loginUserID = accountService.getLoginUserID();
+        } catch (Exception e) {
         }
-        catch (Exception e){
-        }
 
-        return RespGenerstor.success(jobhuntService.save(data,loginUserID));
+        return RespGenerstor.success(jobhuntService.save(data, loginUserID));
+    }
+
+    @PostMapping("saveJobHunt")
+    public BaseResponse<Integer> saveJobHunt(@RequestBody JobHuntVo data) {
+        return RespGenerstor.success(jobhuntService.save(data, accountService.getLoginUserID()));
     }
 
     @PostMapping("/importJobHunt")
-    public BaseResponse<Object> importPost(@RequestBody List<JobHuntVo> dataList){
+    public BaseResponse<Object> importPost(@RequestBody List<JobHuntVo> dataList) {
         List<JobHuntVo> result = jobhuntService.importJobHunt(dataList, accountService.getLoginUserID());
         if (result != null && result.size() > 0) {
             return RespGenerstor.fail(BaseErrorEnum.IMPORT_DATA_ERROR, result);

src/main/java/com/hz/employmentsite/services/impl/companyService/PostServiceImpl.java

@@ -394,7 +394,7 @@ public class PostServiceImpl implements PostService {
             if (stringUtils.IsNullOrEmpty(String.valueOf(item.startTime)) || item.startTime == null)
                 errorInfo += "请填写结束日期!";
             if (stringUtils.IsNullOrEmpty(item.jobPlace))
-                errorInfo += "请填写招聘地点!";
+                errorInfo += "请填写工作地点!";
 
             if (stringUtils.IsNullOrEmpty(item.workYearStr)) {
                 item.workYear = dicWorkYearDataList.stream().filter(it -> it.getName().equals(item.workYearStr.trim()))

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

@@ -22,6 +22,7 @@ export function getJobHuntByID(jobHuntID: string) {
   );
 }
 
+// 不从token获取创建人
 export function saveJobHunt(data: any) {
   return request<object>({
       url: 'jobUserService/jobHunt/save',
@@ -36,6 +37,21 @@ export function saveJobHunt(data: any) {
   );
 }
 
+// 从token获取创建人
+export function saveJobHuntCopy(data: any) {
+  return request<object>({
+      url: 'jobUserService/jobHunt/saveJobHunt',
+      method: 'post',
+      data: data,
+    },
+    {
+      isNew: true,
+      successMsg: '提交成功！',
+      errorMsg: '提交失败！'
+    },
+  );
+}
+
 export function delJobHunt(data: any) {
   return request<object>(
     {

vue/src/views/companyService/post/detail.vue

@@ -11,7 +11,7 @@
         至
         {{ postInfo.endTime ? dayjs(postInfo.endTime).format('YYYY-MM-DD') : '' }}
       </a-descriptions-item>
-      <a-descriptions-item :span="3" label="招聘地点">{{ postInfo.jobPlace }}</a-descriptions-item>
+      <a-descriptions-item :span="3" label="工作地点">{{ postInfo.jobPlace }}</a-descriptions-item>
       <a-descriptions-item label="联系人姓名">{{ postInfo.contactName }}</a-descriptions-item>
       <a-descriptions-item label="联系人电话">{{ postInfo.contactMobile }}</a-descriptions-item>
       <a-descriptions-item label="联系人邮箱">{{ postInfo.contactEmail }}</a-descriptions-item>

vue/src/views/companyService/post/edit.vue

@@ -56,8 +56,8 @@
       </a-row>
       <a-row justify="start">
         <a-col  flex="1330px">
-          <a-form-item label="招聘地点" :label-col="{span:2}" name="jobPlace"
-                       :rules="[{ required: true, message: '请输入招聘地点' }]" >
+          <a-form-item label="工作地点" :label-col="{span:2}" name="jobPlace"
+                       :rules="[{ required: true, message: '请输入工作地点' }]" >
             <a-textarea v-model:value="dataModel.jobPlace" placeholder="" :rows="4"/>
           </a-form-item>
         </a-col>

vue/src/views/companyService/post/index.vue

@@ -179,7 +179,7 @@ export default defineComponent({
         {cnName: '招聘人数', enName: 'recruitCount', width: 100},
         {cnName: '开始日期', enName: 'startTime', width: 100},
         {cnName: '结束日期', enName: 'endTime', width: 100},
-        {cnName: '招聘地点', enName: 'jobPlace', width: 100},
+        {cnName: '工作地点', enName: 'jobPlace', width: 100},
         {cnName: '工作年限', enName: 'workYear', width: 100},
         {cnName: '学历要求', enName: 'cultureLevelName', width: 100},
         {cnName: '岗位最高月薪', enName: 'maxSalary', width: 100},

vue/src/views/jobUserManager/jobhunt/edit.vue

@@ -104,7 +104,7 @@
 <script lang="ts">
 import {defineComponent, reactive, ref, toRefs, watch} from "vue";
 import {useTabsViewStore} from "@/store/modules/tabsView";
-import {getJobHuntByID,saveJobHunt} from "@/api/jobUserManager/jobhunt"
+import {getJobHuntByID, saveJobHuntCopy} from "@/api/jobUserManager/jobhunt"
 import {getJobUserDataList} from "@/api/jobUserManager/jobuser";
 import {getSysDictionaryList} from '@/api/system/dictionary';
 import BUploadFile from "@/components/file/uploadFile.vue";
@@ -254,7 +254,7 @@ export default defineComponent({
       if (isAllowCommit.value){
         formData.dataModel.professionName=null;
         //console.log("当前意向信息",formData.dataModel);
-        saveJobHunt(formData.dataModel).then(result => {
+        saveJobHuntCopy(formData.dataModel).then(result => {
           if (result) {
             onClose(1);
           }

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

@@ -233,9 +233,6 @@
           </a-form-item>
         </a-col>
         <a-col :span="8">
-
-      </a-col>
-        <a-col :span="8">
           <a-form-item label="婚姻状况" :label-col="{span:6}" name="maritalStatusID">
             <a-select
               ref="select"
@@ -246,6 +243,14 @@
             >
             </a-select>
           </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item
+            label="电子邮箱"
+            :label-col="{ span: 6 }"
+            name="email">
+            <a-input v-model:value="dataModel.email" placeholder=""/>
+          </a-form-item>
 <!--          <a-form-item-->
 <!--            label="血型"-->
 <!--            :label-col="{ span: 6 }"-->
@@ -349,12 +354,6 @@
 <!--          </a-form-item>-->
         </a-col>
         <a-col :span="8">
-          <a-form-item
-            label="电子邮箱"
-            :label-col="{ span: 6 }"
-            name="email">
-            <a-input v-model:value="dataModel.email" placeholder=""/>
-          </a-form-item>
         </a-col>
       </a-row>