Merge remote-tracking branch 'origin/master'

h5app/src/utils/position.ts

@@ -38,7 +38,7 @@ export function getPosition() {
                 reject(arguments)
             }, {
                 enableHighAccuracy: true,
-                timeout: 3000
+                timeout: 10000
             })
         } else {
             reject('你的浏览器不支持当前地理位置信息获取')

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

@@ -325,7 +325,8 @@ export default defineComponent({
         insuredCount: null,
         businScope: null,
         companyDesc: null,
-        openId:null
+        openId:null,
+        loginUserID:''
       }});
     const stepList = ref([
       {title: '基础信息', desc: '企业基础信息', val: 1},
@@ -522,6 +523,7 @@ export default defineComponent({
       companyCodeValidate();
       inputDataValidate();
       if(isAllowCommit.value){
+        formState.dataModel.loginUserID = curStepData.value.loginUserID;
         saveCompanyInfo(formState.dataModel).then(result => {
           if (result) {
             router.push({path: './postList', query: {reload:1,id:formState.dataModel.companyID,status:2,userID:curStepData.value.loginUserID,openId:curStepData.value.openID}});

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

@@ -167,6 +167,7 @@ export default defineComponent({
         await presentAlert("请填写完整的信息！");
         return null;
       }
+      educationData.dataModel.loginUserID = curStepData.value.loginUserID;
       saveEducation(educationData.dataModel).then(result => {
         if (result) {
           router.push({path: './userEdit', query: {reload:1,jobUserID: educationData.dataModel.jobuserID,status:2,loginUserId:curStepData.value.loginUserID}});

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

@@ -165,6 +165,7 @@ export default defineComponent({
         await presentAlert("请填写完整的信息！");
         return null;
       }
+      experienceData.dataModel.loginUserID = curStepData.value.loginUserID;
       saveExperience(experienceData.dataModel).then(result => {
         if (result) {
           router.push({path: './userEdit', query: {reload:1,jobUserID: experienceData.dataModel.jobuserID,status:3,loginUserId:curStepData.value.loginUserID}});

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

@@ -245,6 +245,7 @@ export default defineComponent({
         await presentAlert("请填写完整的信息！");
         return null;
       }
+      jobHuntData.dataModel.loginUserID = curStepData.value.loginUserID;
       saveJobHunt(jobHuntData.dataModel).then(result => {
         if (result) {
           router.push({path: './userEdit', query: {reload:1,jobUserID: jobHuntData.dataModel.jobUserID,status:4,loginUserId:curStepData.value.loginUserID}});

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

@@ -209,6 +209,10 @@ import {getSysDictionaryList} from "@/api/system/dictionary";
 import dayjs from "dayjs";
 import postSelection from "@/components/postSelection.vue";
 
+interface StepParams{
+  loginUserID: string,
+}
+
 export default defineComponent({
   name: 'PostEdit',
   components:{postSelection},
@@ -243,7 +247,8 @@ export default defineComponent({
         contactMobile:null,
         contactEmail:null,
         tagID:null,
-        bonus:null
+        bonus:null,
+        loginUserID:''
       }});
     const rules = computed(() => {
       return {
@@ -265,6 +270,9 @@ export default defineComponent({
     const cultureRankList = ref([]);
     const workNatureList = ref([]);
     const postTagList = ref([]);
+    const curStepData = ref<StepParams>({
+      loginUserID:""
+    });
 
     const presentAlert = async (message: string) => {
       const alert = await alertController.create({
@@ -364,6 +372,7 @@ export default defineComponent({
         await presentAlert('请输入完整信息！');
         return null;
       }
+      formState.dataModel.loginUserID = curStepData.value.loginUserID;
       savePost(formState.dataModel).then(result=>{
         if(result){
            router.push({path: "./postList", query: {reload:1,id:formState.dataModel.companyID,status: 3}});
@@ -396,8 +405,9 @@ export default defineComponent({
       postTagList.value = data;
     }
 
-    const loadData = async (postID: any,companyID:any) => {
+    const loadData = async (postID: any,companyID:any,loginUserID:any) => {
       isCommit.value =false;
+      curStepData.value.loginUserID = loginUserID;
       await getWorkYearList();
       await getCultureRankList();
       await getWorkNationList();
@@ -409,14 +419,14 @@ export default defineComponent({
       console.log("初始化岗位信息",formState.dataModel);
     };
 
-    const reload = (postID: any,companyID:any) => {
+    const reload = (postID: any,companyID:any,loginUserID:any) => {
       formState.dataModel.recruitCount = null;
-      loadData(postID,companyID);
+      loadData(postID,companyID,loginUserID);
     }
 
     onIonViewDidEnter(() => {
       if (route.query.reload)
-        reload(route.query.id,route.query.companyID);
+        reload(route.query.id,route.query.companyID,route.query.loginUserID);
     });
 
     return {

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

@@ -225,10 +225,10 @@ export default defineComponent({
     }
 
     const onAdd = () => {
-      router.push({path: './postEdit', query: {reload:1,id: null,companyID:pageParams.companyID}});
+      router.push({path: './postEdit', query: {reload:1,id: null,companyID:pageParams.companyID,loginUserID:curStepData.value.loginUserID}});
     };
     const onEdit = (postID:any) => {
-      router.push({path: './postEdit', query: {reload:1,id:postID,companyID:pageParams.companyID}});
+      router.push({path: './postEdit', query: {reload:1,id:postID,companyID:pageParams.companyID,loginUserID:curStepData.value.loginUserID}});
     };
     const onBack = () => {
         router.push({path: './companyEdit', query: {reload:1,id:pageParams.companyID,siteUserId:curStepData.value.loginUserID}});

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

@@ -530,7 +530,8 @@ export default defineComponent({
         email:'',
         hobby:null,
         personalSkills:null,
-        openId:null
+        openId:null,
+        loginUserID:''
       }});
     const pageParams = reactive({
       pageIndex: 1,
@@ -684,6 +685,7 @@ export default defineComponent({
         }
         inputDataValidate();
         if(isAllowCommit.value){
+          baseInfoData.baseData.loginUserID = curStepData.value.loginUserID;
           baseInfoSave(baseInfoData.baseData).then(result => {
             if (result) {
               router.push({path: '/jobUserInfo/userEdit', query: {reload:0,jobUserID: baseInfoData.baseData.jobUserID,status:2,loginUserId:curStepData.value.loginUserID}});
@@ -777,6 +779,7 @@ export default defineComponent({
       if(curStepData.value.statusVal==1){
         const reqData = await getJobUserById(jobUserID,userId);
         baseInfoData.baseData = reqData;
+        baseInfoData.baseData.openId = openId;
         console.log("当前baseInfoData",baseInfoData.baseData);
         await getStreetList();
       }

src/main/java/com/hz/employmentsite/config/WebConfiguration.java

@@ -85,6 +85,12 @@ public class WebConfiguration implements WebMvcConfigurer {
         excludePath.add("/api/jobusermgr/recommendmgt/getProfessionLevelList");//查询所有求职岗位信息
         excludePath.add("/api/siteInfo/getDataList");
         excludePath.add("/api/companyService/company/getSiteList");
+        excludePath.add("/api/companyService/company/save");
+        excludePath.add("/api/companyService/post/save");
+        excludePath.add("/api/jobUserService/education/save");
+        excludePath.add("/api/jobUserService/experience/save");
+        excludePath.add("/api/jobUserService/jobHunt/save");
+        excludePath.add("/api/jobUserService/jobUser/baseInfoSave");
 
 
         excludePath.add("/api/wx/**");

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

@@ -94,7 +94,13 @@ public class CompanyController {
 
     @PostMapping("/save")
     public BaseResponse<Integer> save(@RequestBody CompanyVo data) {
-        var result = companyService.save(data, accountService.getLoginUserID());
+        String loginUserID = data.loginUserID;
+        try {
+            loginUserID = accountService.getLoginUserID();
+        }
+        catch (Exception e){
+        }
+        var result = companyService.save(data, loginUserID);
         return RespGenerstor.success(result);
     }
 

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

@@ -69,7 +69,14 @@ public class PostController {
 
     @PostMapping("/save")
     public BaseResponse<Integer> save(@RequestBody PostVo data) {
-        var result = postService.save(data, accountService.getLoginUserID());
+        String loginUserID = data.loginUserID;
+        try {
+            loginUserID = accountService.getLoginUserID();
+        }
+        catch (Exception e){
+        }
+
+        var result = postService.save(data, loginUserID);
         return RespGenerstor.success(result);
     }
 

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

@@ -48,7 +48,14 @@ public class EducationController {
 
     @PostMapping("save")
     public BaseResponse<Integer> save(@RequestBody PcEducation data) {
-        return RespGenerstor.success(educationService.save(data,accountService.getLoginUserID()));
+        String loginUserID = "";//data.loginUserID;
+        try {
+            loginUserID = accountService.getLoginUserID();
+        }
+        catch (Exception e){
+        }
+
+        return RespGenerstor.success(educationService.save(data,loginUserID));
     }
 
     @ResponseBody

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

@@ -47,7 +47,14 @@ public class ExperienceController {
 
     @PostMapping("save")
     public BaseResponse<Integer> save(@RequestBody PcExperience data) {
-        return RespGenerstor.success(experienceService.save(data,accountService.getLoginUserID()));
+        String loginUserID = "";//data.loginUserID;
+        try {
+            loginUserID = accountService.getLoginUserID();
+        }
+        catch (Exception e){
+        }
+
+        return RespGenerstor.success(experienceService.save(data,loginUserID));
     }
 
 

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

@@ -80,7 +80,14 @@ public class JobHuntController {
 
     @PostMapping("save")
     public BaseResponse<Integer> save(@RequestBody JobHuntVo data) {
-        return RespGenerstor.success(jobhuntService.save(data,accountService.getLoginUserID()));
+        String loginUserID = data.loginUserID;
+        try {
+            loginUserID = accountService.getLoginUserID();
+        }
+        catch (Exception e){
+        }
+
+        return RespGenerstor.success(jobhuntService.save(data,loginUserID));
     }
 
     @PostMapping("/importJobHunt")

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

@@ -58,7 +58,7 @@ public class JobUserController {
 
     @ResponseBody
     @GetMapping("/getDataByID")
-    public BaseResponse<PcJobuser> getDataById(String id,String loginUserID) {
+    public BaseResponse<PcJobuser> getDataById(String id, String loginUserID) {
         var data = jobuserService.getDataById(id);
         if (data == null) {
             data = new JobUserVo();
@@ -67,12 +67,12 @@ public class JobUserController {
             siteUserExp.or().andUserIDEqualTo(loginUserID);
             //siteUserExp.or().andUserIDEqualTo(accountService.getLoginUserID());
             var curSiteUserInfo = pcSiteUserMapper.selectByExample(siteUserExp).stream().findFirst().orElse(null);
-            if(curSiteUserInfo != null){
+            if (curSiteUserInfo != null) {
                 data.setSiteID(curSiteUserInfo.getSiteID());
                 PcSiteExample siteExp = new PcSiteExample();
                 siteExp.or().andSiteIDEqualTo(curSiteUserInfo.getSiteID());
                 var curSiteInfo = pcSiteMapper.selectByExample(siteExp).stream().findFirst().orElse(null);
-                if(curSiteInfo != null){
+                if (curSiteInfo != null) {
                     data.setRegionCode(curSiteInfo.getRegionCode());
                 }
             }
@@ -118,7 +118,14 @@ public class JobUserController {
     @ResponseBody
     @PostMapping("/baseInfoSave")
     public BaseResponse baseInfoSave(@RequestBody JobUserVo data) {
-        var result = jobuserService.baseInfoSave(data, accountService.getLoginUserID());
+        String loginUserID = data.loginUserID;
+        try {
+            loginUserID = accountService.getLoginUserID();
+        }
+        catch (Exception e){
+        }
+
+        var result = jobuserService.baseInfoSave(data, loginUserID);
         return RespGenerstor.success(result);
     }
 
@@ -138,13 +145,13 @@ public class JobUserController {
                                @RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
                                @RequestParam(required = false) List<String> jobUserIDList,
                                @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 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);
 
-        if(isExport == null || !isExport){
+        if (isExport == null || !isExport) {
             return RespGenerstor.success(result);
-        }else{
+        } else {
             ExcelHelper excelHelper = new ExcelHelper();
             ExcelHelper.ExcelData data = excelHelper.new ExcelData();
             data.setTitles(Arrays.asList(new String[]{"序号", "姓名", "公民身份号码", "性别", "民族", "联系电话", "所属驿站", "年龄", "文化程度", "地址", "就业状态", "重点人员类别"}));

src/main/java/com/hz/employmentsite/filter/exception/GlobalExceptionHandler.java

@@ -19,7 +19,7 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(value = NullPointerException.class)
     public BaseResponse<Object> exceptionHandler(NullPointerException e) {
         logger.error("发生空指针异常！原因是：" + e);
-        return RespGenerstor.fail(BaseErrorEnum.BODY_NOT_MATCH,null);
+        return RespGenerstor.fail(BaseErrorEnum.BODY_NOT_MATCH,e);
     }
 
     @ExceptionHandler(value = Exception.class)

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

@@ -343,7 +343,7 @@ public class JobUserServiceImpl implements JobUserService {
         result += ifRepeatIdentity? 1:0;
         result += ifRepeatMobile? 2:0;
 
-        if(!data.getSocialSecurityCard().equals(null)){
+        if(!stringUtils.IsNullOrEmpty(data.getSocialSecurityCard())){
             PcJobuserExample jobUserExp3= new PcJobuserExample();
             jobUserExp3.or().andUserMobileEqualTo(data.getSocialSecurityCard()).andJobuserIDNotEqualTo(data.getJobUserID());
             var ifRepeatSocialCard = pcJobuserMapper.selectByExample(jobUserExp3).size()>0;

src/main/java/com/hz/employmentsite/vo/companyService/CompanyVo.java

@@ -102,4 +102,6 @@ public class CompanyVo {
     @InstitutionID
     public String institutionID;
 
+    public String loginUserID;
+
 }

src/main/java/com/hz/employmentsite/vo/companyService/PostVo.java

@@ -1,16 +1,29 @@
 package com.hz.employmentsite.vo.companyService;
 
+import com.hz.employmentsite.util.datarange.annotations.InstitutionID;
 import com.hz.employmentsite.util.datarange.annotations.PostID;
+import com.hz.employmentsite.util.datarange.annotations.RegionID;
+import com.hz.employmentsite.util.datarange.annotations.SiteID;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
+
 @Data
 public class PostVo {
 
     @PostID
     public String postID;
 
+    @SiteID
+    private String siteID;
+
+    @InstitutionID
+    public String institutionID;
+
+    @RegionID
+    private String regionCode;
+
     public String workCode;
 
     public String workName;
@@ -107,4 +120,6 @@ public class PostVo {
     public String workNatureName;
     public Integer tagID;
     public String bonus;
+
+    public String loginUserID;
 }

src/main/java/com/hz/employmentsite/vo/jobUserManager/JobHuntVo.java

@@ -1,7 +1,11 @@
 package com.hz.employmentsite.vo.jobUserManager;
 
-import lombok.Data;
+import com.hz.employmentsite.util.datarange.annotations.InstitutionID;
 import com.hz.employmentsite.util.datarange.annotations.JobHuntID;
+import com.hz.employmentsite.util.datarange.annotations.RegionID;
+import com.hz.employmentsite.util.datarange.annotations.SiteID;
+import lombok.Data;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -32,4 +36,14 @@ public class JobHuntVo {
     public String errorMessage;
     public String recommendNum; // 推荐数量
     public String cultureRank;
+
+    // 数据权限
+    @SiteID
+    private String siteID;
+    @InstitutionID
+    public String institutionID;
+    @RegionID
+    private String regionCode;
+
+    public String loginUserID;
 }

src/main/java/com/hz/employmentsite/vo/jobUserManager/JobUserVo.java

@@ -1,6 +1,9 @@
 package com.hz.employmentsite.vo.jobUserManager;
 
+import com.hz.employmentsite.util.datarange.annotations.InstitutionID;
 import com.hz.employmentsite.util.datarange.annotations.JobUserID;
+import com.hz.employmentsite.util.datarange.annotations.RegionID;
+import com.hz.employmentsite.util.datarange.annotations.SiteID;
 import lombok.Data;
 
 import java.util.Date;
@@ -13,8 +16,12 @@ public class JobUserVo {
     @JobUserID
     private String jobUserID;
 
+    @SiteID
     private String siteID;
 
+    @InstitutionID
+    public String institutionID;
+
     private String identityNumber;
 
     private String name;
@@ -63,6 +70,7 @@ public class JobUserVo {
 
     private String provinceCode;
 
+    @RegionID
     private String regionCode;
 
     private String regionName;
@@ -120,5 +128,7 @@ public class JobUserVo {
     private Integer occupationalLevel;
     private String occupationalLevelName;
 
+    public String loginUserID;
+
 
 }

src/main/java/com/hz/employmentsite/vo/jobUserManager/RecommendMgtVo.java

@@ -1,10 +1,11 @@
 package com.hz.employmentsite.vo.jobUserManager;
 
 import com.hz.employmentsite.model.PcRecommendMgt;
+import com.hz.employmentsite.util.datarange.annotations.InstitutionID;
+import com.hz.employmentsite.util.datarange.annotations.RegionID;
+import com.hz.employmentsite.util.datarange.annotations.SiteID;
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 public class RecommendMgtVo extends PcRecommendMgt {
     public String companyName;
@@ -23,4 +24,12 @@ public class RecommendMgtVo extends PcRecommendMgt {
     public String jobuserId;
     public String companyId;
     public Integer workYear;
+
+    // 数据权限
+    @SiteID
+    private String siteID;
+    @InstitutionID
+    public String institutionID;
+    @RegionID
+    private String regionCode;
 }

src/main/java/com/hz/employmentsite/vo/taskAndLog/DoTaskVo.java

@@ -1,10 +1,12 @@
 package com.hz.employmentsite.vo.taskAndLog;
 
-import lombok.Data;
 import com.hz.employmentsite.util.datarange.annotations.DoTaskID;
+import com.hz.employmentsite.util.datarange.annotations.RegionID;
+import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
+import lombok.Data;
+
 import java.util.Date;
 import java.util.List;
-import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 
 @Data
 public class DoTaskVo {
@@ -32,6 +34,7 @@ public class DoTaskVo {
     
     public String streetName;
 
+    @RegionID
     public String regionCode;
 
     public String streetCode;

src/main/java/com/hz/employmentsite/vo/taskAndLog/DoWorkVo.java

@@ -1,7 +1,11 @@
 package com.hz.employmentsite.vo.taskAndLog;
 
-import lombok.Data;
 import com.hz.employmentsite.util.datarange.annotations.DoWorkID;
+import com.hz.employmentsite.util.datarange.annotations.InstitutionID;
+import com.hz.employmentsite.util.datarange.annotations.RegionID;
+import com.hz.employmentsite.util.datarange.annotations.SiteID;
+import lombok.Data;
+
 import java.sql.Date;
 
 @Data
@@ -26,6 +30,7 @@ public class DoWorkVo {
     public String modifyUserID;
     public Date modifyTime;
 
+    @RegionID
     public String regionCode;
     public String regionName;
 
@@ -34,4 +39,9 @@ public class DoWorkVo {
 
     public Integer RecordsCompanyNum;
     public Integer RecordsJobuserNum;
+
+    @SiteID
+    private String siteID;
+    @InstitutionID
+    public String institutionID;
 }

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

@@ -13,12 +13,16 @@
         SELECT COUNT(jobuser.JobuserID) FROM pc_jobuser jobuser WHERE jobuser.CreateUserID = siteUser.UserId AND
         DATE(jobuser.CreateTime) = DATE(workLog.WorkTime)
         ) AS RecordsJobuserNum
+        ,site.SiteID as siteID,inSites.InstitutionID as institutionID
         from pc_dowork workLog
         left join (select * from sys_dictionary_item where DictionaryCode ='LogType' ) dic_logType on workLog.doTypeID =
         dic_logType.Value
         left join area_code region on workLog.RegionCode = region.code
         left join area_code street on workLog.StreetCode = street.code
         left join pc_site_user siteUser on workLog.SiteUserID = siteUser.SiteUserID
+        left join pc_site site on siteUser.siteID = site.siteID
+        left join pc_site_institution inSites on site.SiteID = inSites.SiteID
+        left join pc_institution institution on inSites.institutionID = institution.InstitutionID
         where 1=1
         <if test="doWorkIDList!='' and doWorkIDList!=null">
             and doworkID in (${doWorkIDList})

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

@@ -9,8 +9,12 @@
         ,jobUser.name as JobUserName,dic_jobUserType.Name as jobUserTypeStr,dic_huntJobType.Name as jobHuntTypeStr
         ,profession.ProfessionName, profession.ParentProfessionID, IFNULL(count(rmgt.RecommendMgtID),0) as recommendNum
         ,jobUser.cultureRank
+        , site.SiteID as siteID, inSites.InstitutionID as institutionID, site.RegionCode as regionCode
         from pc_jobhunt jobHunt
         left join pc_jobuser jobUser on jobHunt.JobUserID = jobUser.JobUserID
+        left join pc_site site on site.SiteID = jobuser.SiteID
+        left join pc_site_institution inSites on site.SiteID = inSites.SiteID
+        left join pc_institution institution on inSites.institutionID = institution.InstitutionID
         left join pc_profession profession on jobHunt.professionID = profession.professionID
         left join pc_recommend_mgt rmgt on jobHunt.JobHuntID = rmgt.JobHuntID
         left join (select * from sys_dictionary_item where DictionaryCode ='JobUserType') dic_jobUserType on
@@ -55,11 +59,13 @@
         <if test="isAccomplish != '' and isAccomplish != null">
             and rmgt.EntryState = #{isAccomplish}
         </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,
-        jobHunt.OtherDemand
-        ,jobUser.`Name`,dic_jobUserType.`Name`,dic_huntJobType.`Name`, profession.ProfessionName, profession.ParentProfessionID,jobUser.cultureRank
         order by jobHunt.CreateTime desc
     </select>
+    <!--    getJobHuntList的分组
+    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,
+            jobHunt.OtherDemand
+            ,jobUser.`Name`,dic_jobUserType.`Name`,dic_huntJobType.`Name`, profession.ProfessionName, profession.ParentProfessionID,jobUser.cultureRank
+    -->
 </mapper>

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

@@ -2,7 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.hz.employmentsite.mapper.cquery.JobUserCQuery">
     <select id="selectJobUserList" resultType="com.hz.employmentsite.vo.jobUserManager.JobUserVo">
-        select jobuser.* ,gender.name as GenderName,culture.name as CultureName,site.SiteName,jobstatus.name as
+        select jobuser.* ,gender.name as GenderName,culture.name as
+        CultureName,
+        site.SiteName,inSites.InstitutionID as institutionID,
+        jobstatus.name as
         JobStatusName,keytype.name as KeyTypeName,sys_politics.name as politicsStatusName,sys_health.name as healthName,
         sys_family.name as familyNatureName,sys_full_time.Name as isFullTimeName,occ_cat.OccupationalName as
         occupationalCategoryName,
@@ -42,6 +45,8 @@
         jobuser.MaritalStatusID = sys_marital_status.Value
         left join area_code area_region on jobuser.RegionCode = area_region.code
         left join area_code area_street on jobuser.StreetCode = area_street.code
+        left join pc_site_institution inSites on site.SiteID = inSites.SiteID
+        left join pc_institution institution on inSites.institutionID = institution.InstitutionID
         where 1=1
         <if test="jobUserIDList != '' and jobUserIDList != null">
             and jobuser.jobuserID in (${jobUserIDList})

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

@@ -8,9 +8,13 @@
         post.TrailMaxSalary,post.trailMinSalary,post.createUserID,post.createTime,post.modifyUserID,post.modifyTime,post.validTime,post.startTime,post.endTime,
         post.contactName,post.contactMobile,post.contactEmail,
         post.jobPlace,post.contactName,post.contactMobile,post.contactEmail,post.workNatureID,post.tagID,company.userName,company.userMobile,company.companyEmail,
+        company.CompanyName,company.insuredCount,company.bonus,item.`Name` as cultureLevelName,work_nature.Name as
+        workNatureName,
+        post.ProfessionID,pro.ProfessionName,pro.parentProfessionID,
         company.CompanyName,company.insuredCount,company.bonus,item.`Name` as cultureLevelName,work_nature.Name as workNatureName,
         post.ProfessionID,pro.ProfessionName,pro.parentProfessionID,item2.`Name` as workYearStr
         , IFNULL(count(rmgt.RecommendMgtID),0) as recommendNum
+        , site.SiteID as siteID,inSites.InstitutionID as institutionID, company.RegionCode as regionCode
         from pc_post post
         left join pc_company company on post.CompanyID = company.CompanyID
         left join sys_dictionary_item item on item.value=post.CultureRank and item.DictionaryCode='CultureLevel'
@@ -19,6 +23,9 @@
         work_nature.DictionaryCode='WorkNature'
         left join pc_profession pro on post.ProfessionID = pro.ProfessionID
         left join pc_recommend_mgt rmgt on post.PostID = rmgt.PostID
+        left join pc_site site on company.siteID = site.siteID
+        left join pc_site_institution inSites on site.SiteID = inSites.SiteID
+        left join pc_institution institution on inSites.institutionID = institution.InstitutionID
         <where>
             <if test="postIDList != '' and postIDList != null">
                 and post.postID in (${postIDList})
@@ -42,14 +49,16 @@
                 and post.CompanyID = #{companyID}
             </if>
         </where>
-        group by
-        post.postID,post.workCode,post.workName,post.recruitCount,post.companyID,post.postName,post.recordStatus,post.workNature,post.validDay,
-        post.workYear,post.cultureRank,post.postDesc,post.maxSalary,post.minSalary,post.welfare,post.postEmail,post.workTime,post.isTrail,post.trailMonths,
-        post.TrailMaxSalary,post.trailMinSalary,post.createUserID,post.createTime,post.modifyUserID,post.modifyTime,post.validTime,post.startTime,post.endTime,
-        post.jobPlace,company.userName,company.userMobile,company.companyEmail,company.CompanyName,company.insuredCount,item.`Name`,
-        post.ProfessionID,pro.ProfessionName,pro.parentProfessionID,item2.`Name`
         order by post.CreateTime desc
     </select>
+    <!-- selectPostList的分组
+            group by
+            post.postID,post.workCode,post.workName,post.recruitCount,post.companyID,post.postName,post.recordStatus,post.workNature,post.validDay,
+            post.workYear,post.cultureRank,post.postDesc,post.maxSalary,post.minSalary,post.welfare,post.postEmail,post.workTime,post.isTrail,post.trailMonths,
+            post.TrailMaxSalary,post.trailMinSalary,post.createUserID,post.createTime,post.modifyUserID,post.modifyTime,post.validTime,post.startTime,post.endTime,
+            post.jobPlace,company.userName,company.userMobile,company.companyEmail,company.CompanyName,company.insuredCount,item.`Name`,
+            post.ProfessionID,pro.ProfessionName,pro.parentProfessionID
+     -->
     <select id="selectRecommendPostList" resultType="com.hz.employmentsite.vo.companyService.RecommendPostVo">
         select post.*,
                recommend.recommendID,

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

@@ -10,6 +10,7 @@
         dic4.`name` as jobpeopleisreadname,g.`name` as pushname, dic5.`name` as gendername
         ,e.jobuserId,c.companyId
         ,d.workYear
+        ,site.SiteID as siteID,inSites.InstitutionID as institutionID,site.RegionCode as regionCode
         from pc_recommend_mgt a
         inner join pc_post b on a.PostID = b.PostID
         left join pc_company c on b.CompanyID = c.CompanyID
@@ -28,6 +29,9 @@
         left join (select `Value`,`Name` from sys_dictionary_item where DictionaryCode='Gender') dic5 on e.Sex =
         dic5.`Value`
         left join sys_user g on a.CreateUserID = g.UserID
+        left join pc_site site on site.SiteID = e.SiteID
+        left join pc_site_institution inSites on site.SiteID = inSites.SiteID
+        left join pc_institution institution on inSites.institutionID = institution.InstitutionID
         <where>
             <if test="recommendMgtID != '' and recommendMgtID != null">
                 and a.RecommendMgtID = #{recommendMgtID}