app-根据当前登录人驿站数据过滤1（求职人员、企业岗位）

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

@@ -103,6 +103,7 @@ export default defineComponent({
     const searchParams = reactive({
       pageIndex: 1,
       pageSize: 5,
+      loginUserID: '',
       companyName: '',
     });
     const pagination = computed(() => ({
@@ -114,13 +115,13 @@ export default defineComponent({
 
     const loadData = async function () {
       loading.value = true;
+      const loginUserInfo = useUserStore().getUserInfo;
+      searchParams.loginUserID = curUserID.value = loginUserInfo.userID == undefined?"":loginUserInfo.userID;
       getCompanyList(searchParams).then(data => {
         dataList.value = dataList.value.concat(data.list);
         total.value = data.total;
         console.log(dataList.value);
       })
-      const loginUserInfo = useUserStore().getUserInfo;
-      curUserID.value = loginUserInfo.userID == undefined?"":loginUserInfo.userID;
       loading.value = false;
     }
 

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

@@ -147,7 +147,7 @@
                 <ion-label>民族</ion-label>
                 <ion-select name="nationID"  id="nationID" okText="确定" cancelText="取消" v-model="baseData.nation"
                             interface="action-sheet" placeholder="请选择民族" style="width:100%;text-align:left;" >
-                  <ion-select-option v-for=" (it,key) in nationTypeList" :key="key" :value="it.name">
+                  <ion-select-option v-for=" (it,key) in nationTypeList" :key="key" :value="it.value">
                     {{ it.name }}
                   </ion-select-option>
                 </ion-select>

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

@@ -147,7 +147,7 @@
             <ion-label>民族</ion-label>
             <ion-select name="nationID"  id="nationID" okText="确定" cancelText="取消" v-model="baseData.nation"
                         interface="action-sheet" placeholder="请选择民族" style="width:100%;text-align:left;" >
-              <ion-select-option v-for=" (it,key) in nationTypeList" :key="key" :value="it.name">
+              <ion-select-option v-for=" (it,key) in nationTypeList" :key="key" :value="it.value">
                 {{ it.name }}
               </ion-select-option>
             </ion-select>

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

@@ -107,6 +107,7 @@ export default defineComponent({
     const searchParams = reactive({
       pageIndex: 1,
       pageSize: 5,
+      loginUserID:'',
       name:''
     });
     const dataList = ref<any>([]);
@@ -129,6 +130,8 @@ export default defineComponent({
     }
     const loadData = async function () {
       loading.value = true;
+      const loginUserInfo = useUserStore().getUserInfo;
+      searchParams.loginUserID = curUserID.value = loginUserInfo.userID == undefined?"":loginUserInfo.userID;
       getJobUserList(searchParams).then(data=>{
         dataList.value = dataList.value.concat(data.list);
         total.value = data.total;
@@ -142,8 +145,6 @@ export default defineComponent({
         });
         console.log("dataList",dataList.value);
       });
-      const loginUserInfo = useUserStore().getUserInfo;
-      curUserID.value = loginUserInfo.userID == undefined?"":loginUserInfo.userID;
       loading.value = false;
     }
 

src/main/java/com/hz/employmentsite/controller/companyService/CompanyController.java

@@ -49,9 +49,10 @@ public class CompanyController {
                                                      @RequestParam(required = false) List<String> companyIDList, @RequestParam(required = false) String companyName,
                                                      @RequestParam(required = false) String companyCode, @RequestParam(required = false) String recordStatus,
                                                      @RequestParam(required = false) String regionCode, @RequestParam(required = false) String streetCode,
-                                                     @RequestParam(required = false) String createUserId, @RequestParam(required = false) String workTime) {
+                                                     @RequestParam(required = false) String createUserId, @RequestParam(required = false) String workTime,
+                                                     @RequestParam(required = false) String loginUserID) { //loginUserID暂用来过滤app的当前登录人驿站的求职人员
 
-        PageInfo<CompanyVo> result = companyService.getList(pageIndex, pageSize, companyIDList, companyName, companyCode, recordStatus, regionCode, streetCode, createUserId, workTime);
+        PageInfo<CompanyVo> result = companyService.getList(pageIndex, pageSize, companyIDList, companyName, companyCode, recordStatus, regionCode, streetCode, createUserId, workTime,loginUserID);
 
         return RespGenerstor.success(result);
     }
@@ -127,7 +128,7 @@ public class CompanyController {
                                @RequestParam(required = false) String companyCode, @RequestParam(required = false) String recordStatus,
                                @RequestParam(required = false) String regionCode, @RequestParam(required = false) String streetCode
     ) throws Exception {
-        PageInfo<CompanyVo> result = companyService.getList(pageIndex, pageSize, companyIDList, companyName, companyCode, recordStatus, regionCode, streetCode, null, null);
+        PageInfo<CompanyVo> result = companyService.getList(pageIndex, pageSize, companyIDList, companyName, companyCode, recordStatus, regionCode, streetCode, null, null,null);
         if (isExport == null || !isExport) {
             return RespGenerstor.success(result);
         } else {

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

@@ -15,6 +15,7 @@ import com.hz.employmentsite.services.service.AccountService;
 import com.hz.employmentsite.services.service.jobUserManager.JobUserService;
 import com.hz.employmentsite.util.DateUtils;
 import com.hz.employmentsite.util.ExcelHelper;
+import com.hz.employmentsite.util.StringUtils;
 import com.hz.employmentsite.vo.jobUserManager.JobUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -43,6 +44,9 @@ public class JobUserController {
     @Autowired
     private DateUtils dateUtils;
 
+    @Autowired
+    private StringUtils stringUtils;
+
     @ResponseBody
     @GetMapping("/getList")
     public BaseResponse getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
@@ -50,9 +54,10 @@ public class JobUserController {
                                 @RequestParam(required = false) String name, @RequestParam(required = false) String siteID,
                                 @RequestParam(required = false) String jobStatus, @RequestParam(required = false) Integer sexId,
                                 @RequestParam(required = false) Integer educationTypeId, @RequestParam(required = false) Integer emphasisTypeId,
-                                @RequestParam(required = false) String createUserId, @RequestParam(required = false) String workTime) {
+                                @RequestParam(required = false) String createUserId, @RequestParam(required = false) String workTime,
+                                @RequestParam(required = false) String loginUserID) { //loginUserID暂用来过滤app的当前登录人驿站的求职人员
 
-        PageInfo<JobUserVo> result = jobuserService.getList(pageIndex, pageSize, jobUserIDList, name, siteID, jobStatus, sexId, educationTypeId, emphasisTypeId, createUserId, workTime);
+        PageInfo<JobUserVo> result = jobuserService.getList(pageIndex, pageSize, jobUserIDList, name, siteID, jobStatus, sexId, educationTypeId, emphasisTypeId, createUserId, workTime,loginUserID);
         return RespGenerstor.success(result);
     }
 
@@ -148,7 +153,7 @@ public class JobUserController {
                                @RequestParam(required = false) String name, @RequestParam(required = false) String siteId, @RequestParam(required = false) String jobStatus,
                                @RequestParam(required = false) Integer sexId, @RequestParam(required = false) Integer educationTypeId,
                                @RequestParam(required = false) Integer emphasisTypeId) throws Exception {
-        PageInfo<JobUserVo> result = jobuserService.getList(pageIndex, pageSize, jobUserIDList, name, siteId, jobStatus, sexId, educationTypeId, emphasisTypeId, null, null);
+        PageInfo<JobUserVo> result = jobuserService.getList(pageIndex, pageSize, jobUserIDList, name, siteId, jobStatus, sexId, educationTypeId, emphasisTypeId, null, null,null);
 
         if (isExport == null || !isExport) {
             return RespGenerstor.success(result);

src/main/java/com/hz/employmentsite/mapper/cquery/CompanyCQuery.java

@@ -9,5 +9,6 @@ public interface CompanyCQuery {
     List<CompanyVo> getList(@Param("companyIDList") String companyIDList, @Param("companyName") String companyName,
                             @Param("companyCode") String companyCode, @Param("recordStatus") String recordStatus,
                             @Param("regionCode") String regionCode, @Param("streetCode") String streetCode,
-                            @Param("createUserId") String createUserId, @Param("workTime") String workTime);
+                            @Param("createUserId") String createUserId, @Param("workTime") String workTime,
+                            @Param("curLoginUserSiteID") String curLoginUserSiteID);
 }

src/main/java/com/hz/employmentsite/mapper/cquery/JobUserCQuery.java

@@ -10,5 +10,5 @@ public interface JobUserCQuery {
                                       @Param("siteId") String siteId, @Param("jobStatus") String jobStatus,
                                       @Param("sexId") Integer sexId, @Param("educationTypeId") Integer educationTypeId,
                                       @Param("emphasisTypeId") Integer emphasisTypeId, @Param("createUserId") String createUserId,
-                                      @Param("workTime") String workTime);
+                                      @Param("workTime") String workTime,@Param("curLoginUserSiteID") String curLoginUserSiteID);
 }

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

@@ -3,10 +3,7 @@ package com.hz.employmentsite.services.impl.companyService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.filter.exception.BaseException;
-import com.hz.employmentsite.mapper.AreaCodeMapper;
-import com.hz.employmentsite.mapper.PcCompanyMapper;
-import com.hz.employmentsite.mapper.PcPostMapper;
-import com.hz.employmentsite.mapper.PcSiteMapper;
+import com.hz.employmentsite.mapper.*;
 import com.hz.employmentsite.mapper.cquery.CompanyCQuery;
 import com.hz.employmentsite.model.*;
 import com.hz.employmentsite.services.service.companyService.CompanyService;
@@ -49,14 +46,23 @@ public class CompanyServiceImpl implements CompanyService {
     @Autowired
     private PcPostMapper pcPostMapper;
 
+    @Autowired
+    private PcSiteUserMapper pcSiteUserMapper;
+
     @Override
     public PageInfo<CompanyVo> getList(Integer pageIndex, Integer pageSize,
                                        List<String> companyIDList, String companyName,
                                        String companyCode, String recordStatus,
                                        String regionCode, String streetCode,
-                                       String createUserId, String workTime) {
+                                       String createUserId, String workTime,String loginUserID) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<CompanyVo> dataList = companyCQuery.getList(stringUtils.ListToInSql(companyIDList), companyName, companyCode, recordStatus, regionCode, streetCode, createUserId, workTime);
+        String curLoginUserSiteID = "";
+        if(!stringUtils.IsNullOrEmpty(loginUserID)){
+            PcSiteUserExample siteUserExp = new PcSiteUserExample();
+            siteUserExp.or().andUserIDEqualTo(loginUserID);
+            curLoginUserSiteID = pcSiteUserMapper.selectByExample(siteUserExp).get(0).getSiteID();
+        }
+        List<CompanyVo> dataList = companyCQuery.getList(stringUtils.ListToInSql(companyIDList), companyName, companyCode, recordStatus, regionCode, streetCode, createUserId, workTime,curLoginUserSiteID);
         PageInfo<CompanyVo> result = new PageInfo(dataList);
         return result;
     }
@@ -210,7 +216,7 @@ public class CompanyServiceImpl implements CompanyService {
         }else{
             ids.add(id);
         }
-        return companyCQuery.getList(stringUtils.ListToInSql(ids), null, null, null, null, null, null, null).stream().findFirst().orElse(null);
+        return companyCQuery.getList(stringUtils.ListToInSql(ids), null, null, null, null, null, null, null,null).stream().findFirst().orElse(null);
     }
 
     @Override

src/main/java/com/hz/employmentsite/services/impl/jobUserManager/JobUserServiceImpl.java

@@ -12,6 +12,7 @@ import com.hz.employmentsite.vo.jobUserManager.JobUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.print.DocFlavor;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -36,6 +37,8 @@ public class JobUserServiceImpl implements JobUserService {
     private PcJobhuntMapper pcJobhuntMapper;
     @Autowired
     private PcPostMapper pcPostMapper;
+    @Autowired
+    private PcSiteUserMapper pcSiteUserMapper;
 
     @Override
     public PageInfo<JobUserVo> getList(Integer pageIndex, Integer pageSize,
@@ -43,10 +46,15 @@ public class JobUserServiceImpl implements JobUserService {
                                        String siteId, String jobStatus,
                                        Integer sexId, Integer educationTypeId,
                                        Integer emphasisTypeId, String createUserId,
-                                       String workTime) {
+                                       String workTime,String loginUserID) {
         PageHelper.startPage(pageIndex, pageSize);
-
-        List<JobUserVo> list = jobUserCQuery.selectJobUserList(stringUtils.ListToInSql(jobUserIDList), name, siteId, jobStatus, sexId, educationTypeId, emphasisTypeId, createUserId, workTime);
+        String curLoginUserSiteID = "";
+        if(!stringUtils.IsNullOrEmpty(loginUserID)){
+            PcSiteUserExample siteUserExp = new PcSiteUserExample();
+            siteUserExp.or().andUserIDEqualTo(loginUserID);
+            curLoginUserSiteID = pcSiteUserMapper.selectByExample(siteUserExp).get(0).getSiteID();
+        }
+        List<JobUserVo> list = jobUserCQuery.selectJobUserList(stringUtils.ListToInSql(jobUserIDList), name, siteId, jobStatus, sexId, educationTypeId, emphasisTypeId, createUserId, workTime,curLoginUserSiteID);
 
         PageInfo<JobUserVo> result = new PageInfo(list);
 
@@ -55,7 +63,7 @@ public class JobUserServiceImpl implements JobUserService {
 
     @Override
     public List<SelectProps> getDataList() {
-        var dataList = getList(1, 99999, null, null, null, null, null, null, null, null, null).getList();
+        var dataList = getList(1, 99999, null, null, null, null, null, null, null, null, null,null).getList();
         List<SelectProps> dataResult = new ArrayList<>();
         for (var item: dataList) {
             SelectProps  itemResult = new SelectProps();
@@ -74,7 +82,7 @@ public class JobUserServiceImpl implements JobUserService {
         }else{
             ids.add(id);
         }
-        return jobUserCQuery.selectJobUserList(stringUtils.ListToInSql(ids), null, null, null, null, null, null, null, null).stream().findFirst().orElse(null);
+        return jobUserCQuery.selectJobUserList(stringUtils.ListToInSql(ids), null, null, null, null, null, null, null, null,null).stream().findFirst().orElse(null);
     }
 
     @Override

src/main/java/com/hz/employmentsite/services/service/companyService/CompanyService.java

@@ -14,7 +14,7 @@ public interface CompanyService {
                                 List<String> companyIDList, String companyName,
                                 String companyCode, String recordStatus,
                                 String regionCode, String streetCode,
-                                String createUserId, String workTime);
+                                String createUserId, String workTime,String loginUserID);
 
     List<PcCompany> getCompanyBySiteIDList(String siteID);
 

src/main/java/com/hz/employmentsite/services/service/jobUserManager/JobUserService.java

@@ -15,7 +15,7 @@ public interface JobUserService {
                                 String siteId, String jobStatus,
                                 Integer sexId, Integer educationTypeId,
                                 Integer emphasisTypeId, String createUserId,
-                                String workTime);
+                                String workTime,String loginUserID);
 
     JobUserVo getDataById(String id);
 

src/main/resources/mapping/cquery/CompanyCQuery.xml

@@ -53,6 +53,9 @@
         <if test="workTime!='' and workTime!=null">
             and Date(company.CreateTime) = Date(#{workTime})
         </if>
+        <if test="curLoginUserSiteID!='' and curLoginUserSiteID!=null">
+            and company.siteID = #{curLoginUserSiteID}
+        </if>
         order by company.CreateTime desc,postCount desc
     </select>
 

src/main/resources/mapping/cquery/JobUserCQuery.xml

@@ -59,6 +59,9 @@
         <if test="siteId != null and siteId != ''">
             and jobuser.siteId = #{siteId}
         </if>
+        <if test="curLoginUserSiteID!='' and curLoginUserSiteID!=null">
+            and jobuser.siteId = #{curLoginUserSiteID}
+        </if>
         <if test="jobStatus != null and jobStatus != ''">
             and jobuser.jobStatusID = #{jobStatus}
         </if>
@@ -77,6 +80,7 @@
         <if test="workTime!='' and workTime!=null">
             and Date(jobuser.CreateTime) = Date(#{workTime})
         </if>
+
         order by jobuser.CreateTime desc
     </select>
 </mapper>