Browse Source

app-根据当前登录人驿站数据过滤2(求职意向、岗位信息)

liao-sea 10 months ago
parent
commit
ed2bce1755

+ 20 - 14
h5app/src/views/pages/company/detail.vue

@@ -6,7 +6,7 @@
           <ion-icon :icon="arrowBackOutline" @click="onBack"></ion-icon>
         </ion-buttons>
         <ion-title>
-          企业信息详情
+          {{ curTitle }}
         </ion-title>
       </ion-toolbar>
     </ion-header>
@@ -173,31 +173,32 @@
           </div>
           <div class="form-detail">
             <ion-label>岗位月薪(元)</ion-label>
-            <ion-text>{{ curCompanyPostInfo.minSalary+"-"+curCompanyPostInfo.maxSalary }}</ion-text>
+            <ion-text v-if="curCompanyPostInfo.minSalary!=null&&curCompanyPostInfo.maxSalary!=null">{{ curCompanyPostInfo.minSalary+"-"+curCompanyPostInfo.maxSalary }}</ion-text>
           </div>
           <div class="form-detail" name="isTrailName">
             <ion-label>是否有试用期</ion-label>
-            <ion-text>{{ curCompanyPostInfo.isTrailName }}</ion-text>
+            <ion-text>{{ curCompanyPostInfo.isTrail?"是":"否" }}</ion-text>
           </div>
           <div class="form-detail">
             <ion-label>试用期(月)</ion-label>
-            <ion-text>{{ curCompanyPostInfo.trailMonths }}</ion-text>
+            <ion-text v-if="curCompanyPostInfo.isTrail">{{ curCompanyPostInfo.trailMonths }}</ion-text>
+            <ion-text v-if="!curCompanyPostInfo.isTrail">/</ion-text>
           </div>
           <div class="form-detail">
             <ion-label>试用期月薪(元)</ion-label>
-            <ion-text>{{ curCompanyPostInfo.trailMinSalary+"-"+curCompanyPostInfo.trailMaxSalary }}</ion-text>
-          </div>
+            <ion-text v-if="curCompanyPostInfo.isTrail&&curCompanyPostInfo.trailMinSalary!=null&&curCompanyPostInfo.trailMaxSalary!=null">{{ curCompanyPostInfo.trailMinSalary+"-"+curCompanyPostInfo.trailMaxSalary }}</ion-text>
+            <ion-text v-if="!curCompanyPostInfo.isTrail">/</ion-text> </div>
           <div class="form-detail">
             <ion-label>工作年限要求</ion-label>
             <ion-text>{{ curCompanyPostInfo.companyName }}</ion-text>
           </div>
           <div class="form-detail">
             <ion-label>学历要求</ion-label>
-            <ion-text>{{ curCompanyPostInfo.companyName }}</ion-text>
+            <ion-text>{{ curCompanyPostInfo.cultureLevelName }}</ion-text>
           </div>
           <div class="form-detail">
             <ion-label>其他要求</ion-label>
-            <ion-text>{{ curCompanyPostInfo.workYear }}</ion-text>
+            <ion-text>{{ curCompanyPostInfo.postDesc }}</ion-text>
           </div>
           <div class="form-detail">
             <ion-label>福利待遇</ion-label>
@@ -205,19 +206,19 @@
           </div>
           <div class="form-detail">
             <ion-label>岗位联系人</ion-label>
-            <ion-text>{{ curCompanyPostInfo.userName }}</ion-text>
+            <ion-text>{{ curCompanyPostInfo.contactName }}</ion-text>
           </div>
           <div class="form-detail">
             <ion-label>岗位联系电话</ion-label>
-            <ion-text>{{ curCompanyPostInfo.userMobile }}</ion-text>
+            <ion-text>{{ curCompanyPostInfo.contactMobile }}</ion-text>
           </div>
           <div class="form-detail">
             <ion-label>岗位联系人邮箱</ion-label>
-            <ion-text>{{ curCompanyPostInfo.companyName }}</ion-text>
+            <ion-text>{{ curCompanyPostInfo.contactEmail }}</ion-text>
           </div>
-          <div class="form-detail" name="tagName">
+          <div class="form-detail">
             <ion-label>岗位标签</ion-label>
-            <ion-text>{{ curCompanyPostInfo.TagName }}</ion-text>
+            <ion-text>{{ curCompanyPostInfo.tagName }}</ion-text>
           </div>
         </div>
       </div>
@@ -255,6 +256,7 @@ export default defineComponent({
       companyID:''
     });
     const curTabIndex = ref(1);
+    const curTitle = ref("企业信息详情");
     const loading = ref<boolean>(false);
     const formData = reactive<FormData>({
       dataModel: {}
@@ -282,6 +284,7 @@ export default defineComponent({
     const loadData = async (companyID:any,loginUserID:any)=>{
       loading.value = true;
       curTabIndex.value = 1;
+      curTitle.value ="企业信息详情";
       pageParams.companyID = companyID;
       const reqData = await getCompanyById(companyID,loginUserID);
       formData.dataModel = reqData;
@@ -289,7 +292,7 @@ export default defineComponent({
       const result = await getCompanyPostList(pageParams);
       pageParams.total = result.total;
       console.log("pageParams",pageParams);
-      curCompanyPostList.value = curCompanyPostList.value.concat(result.list);
+      curCompanyPostList.value = result.list;
       console.log("postList",curCompanyPostList.value);
       loading.value = false;
     };
@@ -300,10 +303,12 @@ export default defineComponent({
 
     const onTabChange = (tabIndex:number)=>{
       curTabIndex.value = tabIndex;
+      curTitle.value ="企业信息详情";
     }
 
     const onPostEdit = (curPostID:any)=>{
       curTabIndex.value = 3;
+      curTitle.value ="企业岗位详情";
       (curCompanyPostList.value as any[]).map(item=>{
         if(item.postID == curPostID){
           curCompanyPostInfo.value = item;
@@ -325,6 +330,7 @@ export default defineComponent({
       route,
       router,
       curTabIndex,
+      curTitle,
       pageParams,
       curCompanyPostList,
       curCompanyPostInfo,

+ 1 - 3
h5app/src/views/pages/company/edit.vue

@@ -143,8 +143,7 @@
 
             <div class="form-input">
               <ion-label>成立日期</ion-label>
-              <div>
-                <ion-datetime-button datetime="establishmentTime" style="position:relative;right:110px;"></ion-datetime-button>
+                <ion-datetime-button datetime="establishmentTime" style="position:relative;right:115px;" ></ion-datetime-button>
                 <ion-modal :keep-contents-mounted="true" >
                   <ion-datetime id="establishmentTime" name="establishmentTime"
                                 v-model="dataModel.establishmentTime"  :prefer-wheel="true"
@@ -152,7 +151,6 @@
                                 :show-default-buttons="true" >
                   </ion-datetime>
                 </ion-modal>
-              </div>
             </div>
             <div class="form-input" >
               <ion-label>注册资本(万元)</ion-label>

+ 4 - 2
h5app/src/views/pages/company/editPost.vue

@@ -284,13 +284,13 @@ export default defineComponent({
     }
     const onSave = async function (){
       isCommit.value = true;
-      ifInputAllValid();
       const isFormCorrect = await v$.value.$validate();
       console.log("当前岗位信息",formState.dataModel);
       if (!isFormCorrect) {
         await presentAlert('请输入完整信息!');
         return null;
       }
+      ifInputAllValid();
       if(isCommit.value){
         savePost(formState.dataModel).then(result=>{
           if(result){
@@ -332,7 +332,9 @@ export default defineComponent({
       const reqData = await getPostByID(postID);
       formState.dataModel = reqData;
       formState.dataModel.companyID = companyID;
-      formState.dataModel.welfare = formState.dataModel.bonus;
+      if(formState.dataModel.welfare == null){
+        formState.dataModel.welfare = formState.dataModel.bonus;
+      }
       console.log("初始化岗位信息",formState.dataModel);
     };
 

+ 1 - 1
h5app/src/views/pages/jobUserInfo/companyEdit.vue

@@ -141,7 +141,7 @@
             <div class="form-input">
               <ion-label>成立日期</ion-label>
               <div>
-                <ion-datetime-button datetime="establishmentTime" style="position:relative;right:110px;"></ion-datetime-button>
+                <ion-datetime-button datetime="establishmentTime" style="position:relative;right:115px;"></ion-datetime-button>
                 <ion-modal :keep-contents-mounted="true" >
                   <ion-datetime id="establishmentTime" name="establishmentTime"
                                 v-model="dataModel.establishmentTime"  :prefer-wheel="true"

+ 1 - 1
h5app/src/views/pages/jobUserInfo/postEdit.vue

@@ -371,13 +371,13 @@ export default defineComponent({
 
     const onSave = async function (){
       isCommit.value = true;
-      ifInputAllValid();
       const isFormCorrect = await v$.value.$validate();
       console.log("当前岗位信息",formState.dataModel);
       if (!isFormCorrect) {
         await presentAlert('请输入完整信息!');
         return null;
       }
+      ifInputAllValid();
       formState.dataModel.loginUserID = curStepData.value.loginUserID;
       savePost(formState.dataModel).then(result=>{
         if(result){

+ 1 - 1
h5app/src/views/pages/jobhunt/detail.vue

@@ -59,7 +59,7 @@
         </div>
         <div class="form-detail">
           <ion-label>民族</ion-label>
-          <ion-text>{{ dataModel.nation }}</ion-text>
+          <ion-text>{{ dataModel.nationName }}</ion-text>
         </div>
         <div class="form-detail">
           <ion-label>毕业院校</ion-label>

+ 4 - 0
h5app/src/views/pages/jobhunt/recommend/list.vue

@@ -75,6 +75,7 @@ import {arrowBackOutline,trashOutline} from 'ionicons/icons';
 import {alertController, IonIcon, onIonViewDidEnter} from '@ionic/vue';
 import BEmpty from "@/components/empty.vue";
 import {getJobHuntList, deleteJobHuntAndRecommendMgt} from '@/api/jobHuntInfo/index'
+import {useUserStore} from "@/store/modules/user";
 
 export default defineComponent({
   name: 'RecommendCompanyPostList',
@@ -92,12 +93,15 @@ export default defineComponent({
     const searchParams = reactive({
       pageIndex: 1,
       pageSize: 5,
+      loginUserID: '',
       jobUserName: '',
     });
     const dataList = ref<any>([]);
 
     const loadData = async function () {
       loading.value = true;
+      const loginUserInfo = useUserStore().getUserInfo;
+      searchParams.loginUserID = loginUserInfo.userID == undefined?"":loginUserInfo.userID;
       getJobHuntList(searchParams).then(data => {
         dataList.value = dataList.value.concat(data.list);
         total.value = data.total;

+ 4 - 0
h5app/src/views/pages/post/list.vue

@@ -79,6 +79,7 @@ import {arrowBackOutline, addCircleOutline, buildOutline, trashOutline} from 'io
 import {alertController, IonIcon, onIonViewDidEnter} from '@ionic/vue';
 import BEmpty from "@/components/empty.vue";
 import {getPostList, deletePostAndRecommendMgt} from '@/api/post/index'
+import {useUserStore} from "@/store/modules/user";
 
 export default defineComponent({
   name: 'PostList',
@@ -96,12 +97,15 @@ export default defineComponent({
     const searchParams = reactive({
       pageIndex: 1,
       pageSize: 5,
+      loginUserID:'',
       professionName: '',
     });
     const dataList = ref<any>([]);
 
     const loadData = async function () {
       loading.value = true;
+      const loginUserInfo = useUserStore().getUserInfo;
+      searchParams.loginUserID = loginUserInfo.userID == undefined?"":loginUserInfo.userID;
       getPostList(searchParams).then(data => {
         dataList.value = dataList.value.concat(data.list);
         total.value = data.total;

+ 2 - 2
src/main/java/com/hz/employmentsite/controller/companyService/CompanyController.java

@@ -69,10 +69,10 @@ public class CompanyController {
         if (data == null) {
             data = new CompanyVo();
             data.companyID = UUID.randomUUID().toString();
-            data.recordStatus = 1;
             data.validDate = dateUtils.StrToDate("2099-12-31 00:00:00");
-            data.establishmentTime = new Date();
+            data.setEstablishmentTime(new Date());
             data.isShortage = 1;
+            data.recordStatus = 1;
             PcSiteUserExample siteUserExp = new PcSiteUserExample();
             PcSiteUserExample.Criteria siteUserCro = siteUserExp.createCriteria();
             siteUserCro.andUserIDEqualTo(loginUserID);

+ 5 - 5
src/main/java/com/hz/employmentsite/controller/companyService/PostController.java

@@ -38,10 +38,10 @@ public class PostController {
                                 @RequestParam(required = false) Integer maxCount,
                                 @RequestParam(required = false) String companyName,
                                 @RequestParam(required = false) String recordStatus,
-                                @RequestParam(required = false) String companyID
-                                ) {
+                                @RequestParam(required = false) String companyID,
+                                @RequestParam(required = false) String loginUserID) { //loginUserID暂用来过滤app的当前登录人驿站的求职人员
 
-        PageInfo<PostVo> result = postService.getList(pageIndex, pageSize, postIDList, professionName, minCount, maxCount, companyName, recordStatus,companyID);
+        PageInfo<PostVo> result = postService.getList(pageIndex, pageSize, postIDList, professionName, minCount, maxCount, companyName, recordStatus,companyID,loginUserID);
         return RespGenerstor.success(result);
     }
 
@@ -105,7 +105,7 @@ public class PostController {
     @GetMapping("/getPostsByCompanyID")
     public BaseResponse<List<PostVo>> getPostsByCompanyID(@RequestParam(required = false) String companyId) {
 //        var dataList = postService.getDataListByCompanyID(companyId);
-        PageInfo<PostVo> result = postService.getList(1, 99999, null, null, null, null, null, null, companyId);
+        PageInfo<PostVo> result = postService.getList(1, 99999, null, null, null, null, null, null, companyId,null);
         return RespGenerstor.success(result.getList());
     }
 
@@ -137,7 +137,7 @@ public class PostController {
                                @RequestParam(required = false) Integer maxCount,
                                @RequestParam(required = false) String companyName,
                                @RequestParam(required = false) String recordStatus ) throws Exception {
-        PageInfo<PostVo> result = postService.getList(pageIndex, pageSize, postIDList, professionName, minCount, maxCount, companyName, recordStatus,null);
+        PageInfo<PostVo> result = postService.getList(pageIndex, pageSize, postIDList, professionName, minCount, maxCount, companyName, recordStatus,null,null);
 
         if (isExport == null || !isExport) {
             return RespGenerstor.success(result);

+ 4 - 3
src/main/java/com/hz/employmentsite/controller/jobUserManager/JobHuntController.java

@@ -46,9 +46,10 @@ public class JobHuntController {
                                     @RequestParam(required = false) Integer jobUserTypeID,
                                     @RequestParam(required = false) BigDecimal minSalary,
                                     @RequestParam(required = false) BigDecimal maxSalary,
-                                    @RequestParam(required = false) Integer isAccomplish) {
+                                    @RequestParam(required = false) Integer isAccomplish,
+                                    @RequestParam(required = false) String loginUserID) { //loginUserID暂用来过滤app的当前登录人驿站的求职人员
 
-        PageInfo<JobHuntVo> result = jobhuntService.getList(pageIndex, pageSize,jobHuntIDList,jobUserID,jobUserName,professionName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish);
+        PageInfo<JobHuntVo> result = jobhuntService.getList(pageIndex, pageSize,jobHuntIDList,jobUserID,jobUserName,professionName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish,loginUserID);
         return RespGenerstor.success(result);
     }
 
@@ -109,7 +110,7 @@ public class JobHuntController {
                                @RequestParam(required = false) BigDecimal minSalary, @RequestParam(required = false) BigDecimal maxSalary,
                                @RequestParam(required = false) Integer isAccomplish) throws Exception{
 
-        PageInfo<JobHuntVo> result = jobhuntService.getList(pageIndex, pageSize,jobHuntIDList,jobUserID,jobUserName,workName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish);
+        PageInfo<JobHuntVo> result = jobhuntService.getList(pageIndex, pageSize,jobHuntIDList,jobUserID,jobUserName,workName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish,null);
         ExcelHelper.ExcelData data = excelHelper.new ExcelData();
         data.setTitles(Arrays.asList(new String[]{"序号", "姓名", "希望工作地区", "可到职日期", "工作年限", "求职类型", "求职岗位", "人才类型", "月薪要求"}));
         int i = 0;

+ 1 - 1
src/main/java/com/hz/employmentsite/mapper/cquery/JobHuntCQuery.java

@@ -11,5 +11,5 @@ public interface JobHuntCQuery {
                                       @Param("minWorkYear")Integer minWorkYear,@Param("maxWorkYear")Integer maxWorkYear,
                                       @Param("jobHuntTypeID")Integer jobHuntTypeID, @Param("jobUserTypeID")Integer jobUserTypeID,
                                       @Param("minSalary")BigDecimal minSalary, @Param("maxSalary")BigDecimal maxSalary,
-                                      @Param("isAccomplish")Integer isAccomplish);
+                                      @Param("isAccomplish")Integer isAccomplish,@Param("curLoginUserSiteJobUserIDs")String curLoginUserSiteJobUserIDs);
 }

+ 1 - 1
src/main/java/com/hz/employmentsite/mapper/cquery/PostCQuery.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 public interface PostCQuery {
     List<PostVo> selectPostList(@Param("postIDList")String postIDList,@Param("professionName") String professionName, @Param("minCount")Integer minCount, @Param("maxCount")Integer maxCount,
-                                @Param("companyName")String companyName, @Param("RecordStatus") String RecordStatus,@Param("companyID")String companyID);
+                                @Param("companyName")String companyName, @Param("RecordStatus") String RecordStatus,@Param("companyID")String companyID,@Param("curLoginUserSiteCompanyIDs")String curLoginUserSiteCompanyIDs);
 
     List<RecommendPostVo> selectRecommendPostList(@Param("jobUserID") String jobUserID);
 

+ 18 - 3
src/main/java/com/hz/employmentsite/services/impl/companyService/PostServiceImpl.java

@@ -44,13 +44,28 @@ public class PostServiceImpl implements PostService {
     @Autowired
     private PcCompanyMapper companyMapper;
 
+    @Autowired
+    private PcSiteUserMapper pcSiteUserMapper;
+
     @Autowired
     private DictionaryService dictionaryService;
 
     @Override
-    public PageInfo<PostVo> getList(Integer page, Integer rows, List<String> postIDList, String professionName, Integer minCount, Integer maxCount, String companyName, String recordStatus,String companyID) {
+    public PageInfo<PostVo> getList(Integer page, Integer rows, List<String> postIDList, String professionName, Integer minCount, Integer maxCount, String companyName, String recordStatus,String companyID,String loginUserID) {
         PageHelper.startPage(page, rows);
-        List<PostVo> list = postCQuery.selectPostList(stringUtils.ListToInSql(postIDList), professionName, minCount, maxCount, companyName, recordStatus,companyID);
+        List<String> curLoginUserSiteCompanyIDs = new ArrayList<>();
+        if(!stringUtils.IsNullOrEmpty(loginUserID)){
+            PcSiteUserExample siteUserExp = new PcSiteUserExample();
+            siteUserExp.or().andUserIDEqualTo(loginUserID);
+            var curLoginUserSiteID = pcSiteUserMapper.selectByExample(siteUserExp).get(0).getSiteID();
+            PcCompanyExample companyExp = new PcCompanyExample();
+            companyExp.or().andSiteIDEqualTo(curLoginUserSiteID);
+            var curLoginUserSiteCompanyList = companyMapper.selectByExample(companyExp).stream().toList();
+            for(PcCompany curLoginUserSiteCompany : curLoginUserSiteCompanyList){
+                curLoginUserSiteCompanyIDs.add(curLoginUserSiteCompany.getCompanyID());
+            }
+        }
+        List<PostVo> list = postCQuery.selectPostList(stringUtils.ListToInSql(postIDList), professionName, minCount, maxCount, companyName, recordStatus,companyID,stringUtils.ListToInSql(curLoginUserSiteCompanyIDs));
         PageInfo<PostVo> result = new PageInfo(list);
         return result;
 
@@ -222,7 +237,7 @@ public class PostServiceImpl implements PostService {
         }else{
             ids.add(id);
         }
-        return postCQuery.selectPostList(stringUtils.ListToInSql(ids), null, null, null, null, null,null).stream().findFirst().orElse(null);
+        return postCQuery.selectPostList(stringUtils.ListToInSql(ids), null, null, null, null, null,null,null).stream().findFirst().orElse(null);
     }
 
     @Override

+ 20 - 7
src/main/java/com/hz/employmentsite/services/impl/jobUserManager/JobHuntServiceImpl.java

@@ -3,10 +3,7 @@ package com.hz.employmentsite.services.impl.jobUserManager;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.filter.exception.BaseException;
-import com.hz.employmentsite.mapper.PcJobhuntMapper;
-import com.hz.employmentsite.mapper.PcJobuserMapper;
-import com.hz.employmentsite.mapper.PcProfessionMapper;
-import com.hz.employmentsite.mapper.PcRecommendMgtMapper;
+import com.hz.employmentsite.mapper.*;
 import com.hz.employmentsite.mapper.cquery.JobHuntCQuery;
 import com.hz.employmentsite.model.*;
 import com.hz.employmentsite.services.service.jobUserManager.JobHuntService;
@@ -40,6 +37,10 @@ public class JobHuntServiceImpl implements JobHuntService {
     @Autowired
     private PcRecommendMgtMapper pcRecommendMgtMapper;
 
+    @Autowired
+    private PcSiteUserMapper pcSiteUserMapper;
+
+
     @Autowired
     private DictionaryService dictionaryService;
 
@@ -49,9 +50,21 @@ public class JobHuntServiceImpl implements JobHuntService {
     @Override
     public PageInfo<JobHuntVo> getList(Integer pageIndex, Integer pageSize, List<String> jobHuntIDList,String jobUserID, String jobUserName, String professionName,
                                        Integer minWorkYear, Integer maxWorkYear, Integer jobHuntTypeID, Integer jobUserTypeID,
-                                       BigDecimal minSalary, BigDecimal maxSalary, Integer isAccomplish) {
+                                       BigDecimal minSalary, BigDecimal maxSalary, Integer isAccomplish,String loginUserID) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<JobHuntVo> list = jobhuntCQuery.getJobHuntList(stringUtils.ListToInSql(jobHuntIDList),jobUserID,jobUserName,professionName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish);
+        List<String> curLoginUserSiteJobUserIDs = new ArrayList<>();
+        if(!stringUtils.IsNullOrEmpty(loginUserID)){
+            PcSiteUserExample siteUserExp = new PcSiteUserExample();
+            siteUserExp.or().andUserIDEqualTo(loginUserID);
+            var curLoginUserSiteID = pcSiteUserMapper.selectByExample(siteUserExp).get(0).getSiteID();
+            PcJobuserExample jobUserExp = new PcJobuserExample();
+            jobUserExp.or().andSiteIDEqualTo(curLoginUserSiteID);
+            var curLoginUserSiteJobUserList = pcJobuserMapper.selectByExample(jobUserExp).stream().toList();
+            for(PcJobuser curLoginUserSiteJobUser : curLoginUserSiteJobUserList){
+                curLoginUserSiteJobUserIDs.add(curLoginUserSiteJobUser.getJobuserID());
+            }
+        }
+        List<JobHuntVo> list = jobhuntCQuery.getJobHuntList(stringUtils.ListToInSql(jobHuntIDList),jobUserID,jobUserName,professionName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish,stringUtils.ListToInSql(curLoginUserSiteJobUserIDs));
 
         PageInfo<JobHuntVo> result = new PageInfo(list);
 
@@ -67,7 +80,7 @@ public class JobHuntServiceImpl implements JobHuntService {
             ids.add(jobHuntId);
         }
         JobHuntVo model = jobhuntCQuery.getJobHuntList(stringUtils.ListToInSql(ids),null,null,null,null,null,
-                null,null,null,null,null).stream().findFirst().orElse(null);
+                null,null,null,null,null,null).stream().findFirst().orElse(null);
         return model;
     }
 

+ 1 - 1
src/main/java/com/hz/employmentsite/services/service/companyService/PostService.java

@@ -6,7 +6,7 @@ import com.hz.employmentsite.vo.companyService.PostVo;
 import java.util.List;
 
 public interface PostService {
-    PageInfo<PostVo> getList(Integer page, Integer rows, List<String> postIDList,String professionName, Integer minCount, Integer maxCount, String companyName,String RecordStatus ,String companyID);
+    PageInfo<PostVo> getList(Integer page, Integer rows, List<String> postIDList,String professionName, Integer minCount, Integer maxCount, String companyName,String RecordStatus,String companyID,String loginUserID);
     PageInfo<RecommendPostVo> getCommendPostList(Integer page, Integer rows, String jobUserID);
     Integer saveCommendPost(RecommendPostVo data, String userId);
     int save(PostVo data, String userId);

+ 1 - 1
src/main/java/com/hz/employmentsite/services/service/jobUserManager/JobHuntService.java

@@ -9,7 +9,7 @@ public interface JobHuntService {
 
     PageInfo<JobHuntVo> getList(Integer pageIndex, Integer pageSize,List<String> jobHuntIDList, String jobUserID, String jobUserName, String professionName,
                                 Integer minWorkYear, Integer maxWorkYear, Integer jobHuntTypeID, Integer jobUserTypeID,
-                                BigDecimal minSalary, BigDecimal maxSalary, Integer isAccomplish);
+                                BigDecimal minSalary, BigDecimal maxSalary, Integer isAccomplish, String loginUserID);
 
     JobHuntVo get(String jobHuntId);
 

+ 3 - 0
src/main/resources/mapping/cquery/JobHuntCQuery.xml

@@ -28,6 +28,9 @@
         <if test="jobUserID != '' and jobUserID != null">
             and jobHunt.jobUserID = #{jobUserID}
         </if>
+        <if test="curLoginUserSiteJobUserIDs != '' and curLoginUserSiteJobUserIDs != null">
+            and jobHunt.jobUserID in (${curLoginUserSiteJobUserIDs})
+        </if>
         <if test="jobUserName != '' and jobUserName != null">
             and jobUser.name like Concat('%',#{jobUserName},'%')
         </if>

+ 3 - 0
src/main/resources/mapping/cquery/PostCQuery.xml

@@ -45,6 +45,9 @@
             <if test="companyID != null and companyID != ''">
                 and post.CompanyID = #{companyID}
             </if>
+            <if test="curLoginUserSiteCompanyIDs != '' and curLoginUserSiteCompanyIDs != null">
+                and post.companyID in (${curLoginUserSiteCompanyIDs})
+            </if>
         </where>
         group by
         post.postID,post.workCode,post.workName,post.recruitCount,post.companyID,post.postName,post.recordStatus,post.workNature,post.validDay,