web-岗位推荐求职人员详情页面查询数据范围调整

doc/待更新脚本.txt

@@ -1,6 +1,6 @@
 -- 2024-6-17 求职人员统计菜单与权限数据
-INSERT INTO sys_function_code VALUES ('T010504', '求职人员统计', 'T0105', 4);
-INSERT INTO `sys_menu` VALUES ('T010504', 4, '求职人员统计', NULL, 'views/statistics/JobUserCount', '/JobUserCount', 'T0105', NULL, 0, 1, 1, 'T010504', 1, NULL,NULL);
+insert into sys_function_code values ('T010504', '求职人员统计', 'T0105', 4);
+insert into`sys_menu` values ('T010504', 4, '求职人员统计', NULL, 'views/statistics/JobUserCount', '/JobUserCount', 'T0105', NULL, 0, 1, 1, 'T010504', 1, NULL,NULL);
 insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('20afde90-a81a-11ed-a6c5-7085c2a9999e','T010504');
 
 -- 2024-6-18 求职人员服务记录表
@@ -19,17 +19,18 @@ CREATE TABLE `employmentsitedb`.`pc_jobuser_service`  (
 
 -- 2024.06.18 企业表新增注册资本类型字段，字典表新增注册资本类型字典
 insert into sys_dictionary values ('RegisteredCapitalType','注册资本类型','10','1');
-INSERT INTO sys_dictionary_item  VALUES (uuid(), '', 'RegisteredCapitalType', 1, '万元(人民币)', 10, 1, 0),
+insert into sys_dictionary_item  values
+(uuid(), '', 'RegisteredCapitalType', 1, '万元(人民币)', 10, 1, 0),
 (uuid(), '', 'RegisteredCapitalType', 2, '万元(港币)', 20, 1, 0),
-       (uuid(), '', 'RegisteredCapitalType', 3, '万元(美元)', 30, 1, 0),
-       (uuid(), '', 'RegisteredCapitalType', 4, '万元(欧元)', 40, 1, 0),
-       (uuid(), '', 'RegisteredCapitalType', 5, '万元(日元)', 50, 1, 0),
-       (uuid(), '', 'RegisteredCapitalType', 6, '万元(其他)', 60, 1, 0);
+(uuid(), '', 'RegisteredCapitalType', 3, '万元(美元)', 30, 1, 0),
+(uuid(), '', 'RegisteredCapitalType', 4, '万元(欧元)', 40, 1, 0),
+(uuid(), '', 'RegisteredCapitalType', 5, '万元(日元)', 50, 1, 0),
+(uuid(), '', 'RegisteredCapitalType', 6, '万元(其他)', 60, 1, 0);
 
-alter table pc_company add column RegisteredCapitalType int  comment '注册资本类型' AFTER RegisteredCapital;
+alter table pc_company add column RegisteredCapitalType int  comment '注册资本类型' after RegisteredCapital;
 update pc_company set RegisteredCapitalType =1
 
 -- 2024-6-19 求职人员服务跟进权限字典码与权限赋值
-INSERT INTO sys_function_code VALUES ('T01030108', '服务跟进', 'T010301', 8);
+insert into sys_function_code values ('T01030108', '服务跟进', 'T010301', 8);
 insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('20afde90-a81a-11ed-a6c5-7085c2a9999e','T01030108');
 insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('10a12f77-0958-4220-b9ce-07b9215046f2','T01030108');

src/main/java/com/hz/employmentsite/controller/baseSettings/SiteInfoController.java

@@ -41,6 +41,15 @@ public class SiteInfoController {
         return RespGenerstor.success(result);
     }
 
+    @ResponseBody
+    @GetMapping("/getAllSite")
+    public BaseResponse<PageInfo<SiteInfoVo>> getAllSite() {
+
+        PageInfo<SiteInfoVo> result = siteInfoService.getAllSite(1,9999);
+
+        return RespGenerstor.success(result);
+    }
+
     @ResponseBody
     @GetMapping("/getDataList")
     public BaseResponse<List<SelectProps>> getDataList() {

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

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

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

@@ -69,8 +69,8 @@ public class JobUserController {
 
     @ResponseBody
     @GetMapping("/getDataByID")
-    public BaseResponse<PcJobuser> getDataById(String id, String loginUserID, @RequestParam(required = false) Integer cipherType) {
-        var data = jobuserService.getDataById(id);
+    public BaseResponse<PcJobuser> getDataById(String id, String loginUserID, @RequestParam(required = false) Boolean isAllJobUser) {
+        var data = jobuserService.getDataById(id,isAllJobUser);
         if (data == null) {
             data = new JobUserVo();
             data.setJobUserID(UUID.randomUUID().toString());
@@ -92,7 +92,8 @@ public class JobUserController {
                     data.setRegionCode(curSiteInfo.getRegionCode());
                 }
             }
-        } else {
+        }
+        else {
 //            if (cipherType != null && cipherType == 1) {
 //                // 信息脱敏
 //                data.setIdentityNumber(stringUtils.desensitizeData(data.getIdentityNumber(), "************", 3, 4));
@@ -118,15 +119,15 @@ public class JobUserController {
 
     @ResponseBody
     @GetMapping("/getEducationList")
-    public BaseResponse getEducationList(String id) {
-        var educationList = jobuserService.getJobUserEducationList(id);
+    public BaseResponse getEducationList(String id,boolean isAllJobUser) {
+        var educationList = jobuserService.getJobUserEducationList(id,isAllJobUser);
         return RespGenerstor.success(educationList);
     }
 
     @ResponseBody
     @GetMapping("/getExperienceList")
-    public BaseResponse getExperienceList(String id) {
-        var experienceList = jobuserService.getJobUserPcExperienceList(id);
+    public BaseResponse getExperienceList(String id,boolean isAllJobUser) {
+        var experienceList = jobuserService.getJobUserExperienceList(id,isAllJobUser);
         return RespGenerstor.success(experienceList);
     }
 

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

@@ -15,7 +15,7 @@ public interface JobHuntCQuery {
                                    @Param("minSalary") BigDecimal minSalary, @Param("maxSalary") BigDecimal maxSalary,
                                    @Param("isAccomplish") Integer isAccomplish, @Param("curLoginUserSiteJobUserIDs") String curLoginUserSiteJobUserIDs,
                                    @Param("siteID") String siteID, @Param("regionCode") String regionCode,
-                                   @Param("startDate") Date startDate, @Param("endDate") Date endDate);
+                                   @Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("isAllJobHunt") boolean isAllJobHunt);
 
     List<JobHuntVo> selectJobHuntInCompanyIDs(@Param("jobUserIDList") String jobUserIDList);
 }

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

@@ -15,7 +15,7 @@ public interface JobUserCQuery {
                                       @Param("emphasisTypeId") Integer emphasisTypeId, @Param("createUserId") String createUserId,
                                       @Param("workTime") String workTime, @Param("curLoginUserSiteID") String curLoginUserSiteID,
                                       @Param("regionCode") String regionCode, @Param("startDate") Date startDate,
-                                      @Param("endDate") Date endDate);
+                                      @Param("endDate") Date endDate,@Param("isAllJobUser") boolean isAllJobUser);
 
     List<PcJobuser> getJobUserIdentityNumber();
 

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

@@ -11,6 +11,8 @@ public interface SiteInfoCQuery {
                              @Param("siteName") String siteName, @Param("institutionID") String institutionID,
                              @Param("regionCode") String regionCode, @Param("streetCode") String streetCode);
 
+    List<SiteInfoVo> getAllSite();
+
     List<SiteInfoVo> getListByInstitutionID(@Param("institutionID") String institutionID);
 
     /**

src/main/java/com/hz/employmentsite/services/impl/baseSettings/SiteInfoImpl.java

@@ -51,6 +51,14 @@ public class SiteInfoImpl implements SiteInfoService {
         return result;
     }
 
+    @Override
+    public PageInfo<SiteInfoVo> getAllSite(int pageIndex, int pageSize) {
+        PageHelper.startPage(pageIndex, pageSize);
+        List<SiteInfoVo> dataList = siteInfoCQuery.getAllSite();
+        PageInfo<SiteInfoVo> result = new PageInfo(dataList);
+        return result;
+    }
+
     @Override
     public List<SelectProps> getDataList() {
         var dataList = getList(1,99999,null,null,null,null,null,null).getList();

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

@@ -53,7 +53,7 @@ public class JobHuntServiceImpl implements JobHuntService {
     public PageInfo<JobHuntVo> getList(Integer pageIndex, Integer pageSize, List<String> jobHuntIDList, String jobUserID, String jobUserName, String professionName,
                                        BigDecimal minWorkYear, BigDecimal maxWorkYear, Integer jobHuntTypeID, Integer jobUserTypeID,
                                        BigDecimal minSalary, BigDecimal maxSalary, Integer isAccomplish, String loginUserID,
-                                       String siteID, String regionCode, Date startDate, Date endDate) {
+                                       String siteID, String regionCode, Date startDate, Date endDate,boolean isAllJobHunt) {
         List<String> curLoginUserSiteJobUserIDs = new ArrayList<>();
         if (!stringUtils.IsNullOrEmpty(loginUserID)) {
             PcSiteUserExample siteUserExp = new PcSiteUserExample();
@@ -76,7 +76,7 @@ public class JobHuntServiceImpl implements JobHuntService {
                     professionName, minWorkYear, maxWorkYear,
                     jobHuntTypeID, jobUserTypeID, minSalary,
                     maxSalary, isAccomplish, stringUtils.ListToInSql(curLoginUserSiteJobUserIDs),
-                    siteID, regionCode, startDate, endDate);
+                    siteID, regionCode, startDate, endDate, isAllJobHunt);
         }
         PageInfo<JobHuntVo> result = new PageInfo(list);
 
@@ -92,7 +92,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, null, null, null, null, null).stream().findFirst().orElse(null);
+                null, null, null, null, null, null, null, null, null, null,true).stream().findFirst().orElse(null);
         return model;
     }
 

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

@@ -89,7 +89,7 @@ public class JobUserServiceImpl implements JobUserService {
             curLoginUserSiteID = pcSiteUserMapper.selectByExample(siteUserExp).get(0).getSiteID();
         }
         PageHelper.startPage(pageIndex, pageSize);
-        List<JobUserVo> list = jobUserCQuery.selectJobUserList(stringUtils.ListToInSql(jobUserIDList), name, siteId, jobStatus, sexId, educationTypeId, emphasisTypeId, createUserId, workTime, curLoginUserSiteID, regionCode, startDate, endDate);
+        List<JobUserVo> list = jobUserCQuery.selectJobUserList(stringUtils.ListToInSql(jobUserIDList), name, siteId, jobStatus, sexId, educationTypeId, emphasisTypeId, createUserId, workTime, curLoginUserSiteID, regionCode, startDate, endDate, false);
         // 信息脱敏
         list.forEach(item -> {
             item.setUserMobile(calculateUtils.maskMobile(desUtils.decoderText(item.getUserMobile())));
@@ -170,13 +170,13 @@ public class JobUserServiceImpl implements JobUserService {
     }
 
     @Override
-    public JobUserVo getDataById(String id) {
+    public JobUserVo getDataById(String id,boolean isAllJobUser) {
 
         if (stringUtils.IsNullOrEmpty(id)) {
             return null;
         }
 
-        JobUserVo data = jobUserCQuery.selectJobUserList(stringUtils.ListToInSql(Arrays.asList(id)), null, null, null, null, null, null, null, null,null,null,null,null).stream().findFirst().orElse(null);
+        JobUserVo data = jobUserCQuery.selectJobUserList(stringUtils.ListToInSql(Arrays.asList(id)), null, null, null, null, null, null, null, null,null,null,null,null,isAllJobUser).stream().findFirst().orElse(null);
         if(data!=null){
             data.listLabel = labelCQuery.getUserLabelList(id);
             data.setAge(calculateUtils.calculateAge(desUtils.decoderText(data.getIdentityNumber())));
@@ -185,21 +185,21 @@ public class JobUserServiceImpl implements JobUserService {
     }
 
     @Override
-    public List<PcEducation> getJobUserEducationList(String jobuserID) {
+    public List<PcEducation> getJobUserEducationList(String jobuserID,boolean isAllJobUser) {
         PcEducationExample exp = new PcEducationExample();
         exp.setOrderByClause("SchoolTime DESC");
-        PcEducationExample.Criteria cro = exp.or();
-        cro.andJobuserIDEqualTo(jobuserID);
+        exp.or().andJobuserIDEqualTo(jobuserID);
+        if(isAllJobUser)  exp.or().andJobuserIDEqualTo("AllJobUser");
         List<PcEducation> educationList = pcEducationMapper.selectByExample(exp);
         return educationList;
     }
 
     @Override
-    public List<PcExperience> getJobUserPcExperienceList(String jobuserID) {
+    public List<PcExperience> getJobUserExperienceList(String jobuserID,boolean isAllJobUser) {
         PcExperienceExample exp = new PcExperienceExample();
         exp.setOrderByClause("StartTime DESC");
-        PcExperienceExample.Criteria cro = exp.or();
-        cro.andJobuserIDEqualTo(jobuserID);
+        exp.or().andJobuserIDEqualTo(jobuserID);
+        if(isAllJobUser) exp.or().andJobuserIDEqualTo("AllJobUser");
         List<PcExperience> experienceList = pcExperienceMapper.selectByExample(exp);
         return experienceList;
     }

src/main/java/com/hz/employmentsite/services/service/baseSettings/SiteInfoService.java

@@ -12,6 +12,8 @@ public interface SiteInfoService {
 
     PageInfo<SiteInfoVo> getList(int pageIndex, int pageSize, List<String> siteIDList, String siteCode, String siteName, String institutionName, String regionCode, String streetCode);
 
+    PageInfo<SiteInfoVo> getAllSite(int pageIndex, int pageSize);
+
     List<SelectProps> getDataList();
 
     /**

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

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

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

@@ -24,13 +24,13 @@ public interface JobUserService {
 
     int setJobUserDes();
 
-    JobUserVo getDataById(String id);
+    JobUserVo getDataById(String id,boolean isAllJobUser);
 
     PageInfo<JobUserVo> getDataList(Integer page, Integer rows,String jobUserName);
 
-    List<PcEducation> getJobUserEducationList(String jobuserID);
+    List<PcEducation> getJobUserEducationList(String jobuserID,boolean isAllJobUser);
 
-    List<PcExperience> getJobUserPcExperienceList(String jobuserID);
+    List<PcExperience> getJobUserExperienceList(String jobuserID,boolean isAllJobUser);
 
     List<PcPost> getUserHuntList(String jobuserID);
 

src/main/java/com/hz/employmentsite/util/datarange/DataRangeInterceptor.java

@@ -85,6 +85,9 @@ public class DataRangeInterceptor implements Interceptor {
                     if(mainSql.contains("task.dotaskID,task.siteID")){
                         whereClause += " or x.siteID is null ";
                     }
+                    if(mainSql.contains("site.siteName = 'AllSite'")||mainSql.contains("JobUserID = 'AllJobUser'")){
+                        whereClause = " where 1=1 ";
+                    }
                     mainSql = "select x.* from" +
                             "(" + mainSql + ") x " +
                             whereClause;

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

@@ -80,6 +80,9 @@
             and jobHunt.CreateTime <![CDATA[ >= ]]> #{startDate}
             and jobHunt.CreateTime <![CDATA[ <= ]]> #{endDate}
         </if>
+        <if test="isAllJobHunt != null and isAllJobHunt == true ">
+            or jobHunt.JobUserID = 'AllJobUser'
+        </if>
         group by jobHunt.JobHuntID, jobHunt.JobUserID, jobHunt.ProfessionID, jobHunt.WorkCode, jobHunt.WorkName,
         jobHunt.AreaWork, jobHunt.InDate, jobHunt.WorkYear, jobHunt.JobHuntType, jobHunt.JobUserType, jobHunt.MinSalary,
         jobHunt.MaxSalary, jobHunt.CreateUserID, jobHunt.CreateTime, jobHunt.ModifyUserID, jobHunt.ModifyTime,

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

@@ -102,6 +102,9 @@
             and jobuser.CreateTime <![CDATA[ >= ]]> #{startDate}
             and jobuser.CreateTime <![CDATA[ <= ]]> #{endDate}
         </if>
+        <if test="isAllJobUser != null and isAllJobUser == true ">
+            or jobuser.JobUserID = 'AllJobUser'
+        </if>
         order by jobuser.CreateTime desc
     </select>
     <select id="getJobUserIdentityNumber" resultType="com.hz.employmentsite.model.PcJobuser">

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

@@ -47,6 +47,15 @@
         order by site.CreateTime desc
     </select>
 
+    <select id="getAllSite" resultType="com.hz.employmentsite.vo.baseSettings.SiteInfoVo">
+        select site.*,inSites.InstitutionID as InstitutionID,inSites.SiteInstitutionID,institution.companyName as
+        InstitutionName, region.name as RegionName,street.name as StreetName from pc_site site
+        left join pc_site_institution inSites on site.SiteID = inSites.SiteID
+        left join pc_institution institution on inSites.institutionID = institution.InstitutionID
+        left join area_code region on site.RegionCode = region.code
+        left join area_code street on site.StreetCode = street.code
+        where 1=1 or site.siteName = 'AllSite'  order by site.CreateTime desc
+    </select>
     <select id="getListByInstitutionID" resultType="com.hz.employmentsite.vo.baseSettings.SiteInfoVo">
         select  A.*,B.SiteInstitutionID,C.InstitutionID from pc_site A,pc_site_institution B,pc_institution C
         where A.siteID = B.siteID and B.institutionID = C.institutionID and 1=1

vue/src/api/baseSettings/siteInfo.ts

@@ -1,5 +1,18 @@
 import {request} from "@/utils/request";
 
+export function getAllSite() {
+  return request<object>(
+    {
+      url: "siteInfo/getAllSite",
+      method: 'get',
+      params: null,
+    },
+    {
+      isNew: true,
+    },
+  );
+}
+
 export function getSiteList(params:any) {
   return request<object>(
     {

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

@@ -23,12 +23,12 @@ export function getJobUserDataList(params: any){
   );
 }
 
-export function getDataById(id: any, loginUserID: any, cipherType: any) {
+export function getDataById(id: any, loginUserID: any, isAllJobUser: boolean) {
   return request(
     {
       url: 'jobUserService/jobUser/getDataByID',
       method: 'get',
-      params: {id, loginUserID, cipherType},
+      params: {id, loginUserID, isAllJobUser},
     },
     { isNew: true },
   );
@@ -63,12 +63,12 @@ export function del(data: any) {
   )
 }
 
-export function getEducationList(id: any) {
+export function getEducationList(id: any,isAllJobUser: boolean) {
   return request(
     {
       url: "jobUserService/jobUser/getEducationList",
       method: 'get',
-      params: {id},
+      params: {id:id,isAllJobUser:isAllJobUser},
     },
     {
       isNew: true,
@@ -76,12 +76,12 @@ export function getEducationList(id: any) {
   );
 }
 
-export function getExperienceList(id: any) {
+export function getExperienceList(id: any,isAllJobUser: boolean) {
   return request(
     {
       url: "jobUserService/jobUser/getExperienceList",
       method: 'get',
-      params: {id},
+      params: {id:id,isAllJobUser: isAllJobUser},
     },
     {
       isNew: true,

vue/src/views/companyService/post/jobUserDetail.vue

@@ -185,7 +185,7 @@ export default defineComponent({
       await loadJobHuntData(id);
       await loadEducationData(id);
       await loadExperienceData(id);
-      getDataById(id, userInfo.value.userID, 1).then(data => {
+      getDataById(id, userInfo.value.userID, true).then(data => {
         jobUserInfo.dataModel = data;
         jobUserInfo.dataModel.userMobile = crtyptoHelp.decryptDesText(jobUserInfo.dataModel.userMobile);
         jobUserInfo.dataModel.identityNumber = crtyptoHelp.decryptDesText(jobUserInfo.dataModel.identityNumber);
@@ -198,7 +198,7 @@ export default defineComponent({
     }
     // 加载教育经历
     const loadEducationData = (id: any) => {
-      getEducationList(id).then(data => {
+      getEducationList(id,true).then(data => {
         if (data) {
           educationData.value = data;
         }
@@ -206,7 +206,7 @@ export default defineComponent({
     }
     // 加载工作经历
     const loadExperienceData = (id: any) => {
-      getExperienceList(id).then(data => {
+      getExperienceList(id,true).then(data => {
         if (data) {
           experienceData.value = data;
         }
@@ -217,7 +217,8 @@ export default defineComponent({
       let params = {
         pageIndex: 1,
         pageSize: 999,
-        jobUserID:id
+        jobUserID:id,
+        isAllJobHunt:true
       }
       getJobHuntList(params).then(result => {
         jobHuntListData.value = result.list

vue/src/views/companyService/post/recommend.vue

@@ -212,7 +212,7 @@ import type {SelectProps} from "ant-design-vue";
 import {getSysDictionaryList} from "@/api/system/dictionary";
 import {message} from "ant-design-vue";
 import {debounce} from "lodash-es";
-import {getSiteList} from "@/api/baseSettings/siteInfo";
+import {getAllSite} from "@/api/baseSettings/siteInfo";
 import {getRegionCodeList} from '@/api/system/area/index';
 import JobUserDetailModel from "./jobUserDetail.vue";
 
@@ -306,7 +306,7 @@ export default defineComponent({
     };
     const getAllSites = async function () {
       siteList.value = [];
-      getSiteList({pageIndex:1,pageSize:9999}).then((result :any) => {
+      getAllSite().then((result :any) => {
         result.list.map(x=>{
           if(curRegionNameList.value.length>0){
             curRegionNameList.value.map(m=> {

vue/src/views/jobUserManager/jobhunt/recommend.vue

@@ -208,7 +208,7 @@ import dayjs from 'dayjs';
 import {message, SelectProps} from "ant-design-vue";
 import {get} from "@/api/common";
 import {debounce} from "lodash-es";
-import {getSiteList} from "@/api/baseSettings/siteInfo";
+import {getAllSite} from "@/api/baseSettings/siteInfo";
 import {getRegionCodeList} from '@/api/system/area/index';
 import {getSysDictionaryList} from "@/api/system/dictionary";
 import CompanyDetailModel from "./companyDetail.vue";
@@ -269,7 +269,8 @@ export default defineComponent({
     };
     const getAllSites = async function (){
       allSiteList.value = [];
-      getSiteList({pageIndex:1,pageSize:9999}).then((result :any) => {
+      getAllSite().then((result :any) => {
+        console.log(result);
         result.list.map(x=>{
           if(curRegionNameList.value.length>0){
             curRegionNameList.value.map(m=> {

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

@@ -778,7 +778,7 @@ export default defineComponent(
       }
 
       const loadEducation = (id: any) => {
-        getEducationList(id).then(data => {
+        getEducationList(id,true).then(data => {
           if (data)
             educationData.value = data;
         });
@@ -836,7 +836,7 @@ export default defineComponent(
       ]
       const experienceData = ref([]);
       const loadExperienceData = (id: any) => {
-        getExperienceList(id).then(data => {
+        getExperienceList(id,true).then(data => {
           if (data) {
             experienceData.value = data;
           }
@@ -945,7 +945,7 @@ export default defineComponent(
         getOccupationalLevelList()
         getFirstOccupationalList()
         getInfo().then((loginUserInfo:any)=>{
-          getDataById(id,loginUserInfo.userID,null).then(data => {
+          getDataById(id,loginUserInfo.userID,true).then(data => {
             formState.dataModel = data;
             formState.dataModel.userMobile = crtyptoHelp.decryptDesText(formState.dataModel.userMobile);
             formState.dataModel.identityNumber = crtyptoHelp.decryptDesText(formState.dataModel.identityNumber);

vue/src/views/jobUserManager/jobuser/vitae.vue

@@ -257,7 +257,7 @@ const cultureList = ref<SelectProps['options']>();
 
 // 加载求职人员数据
 const loadData = (id: any) => {
-  getDataById(id, userInfo.value.userID, 1).then(data => {
+  getDataById(id, userInfo.value.userID, false).then(data => {
     Object.keys(jobUserInfo).forEach(key => {
       jobUserInfo[key] = data[key];
     })

vue/src/views/statistics/MonthSystemApplyCount.vue

@@ -394,7 +394,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style  lang="less" scoped>
 .image-table-box {
   width: 100%;
   height: 100%;