Procházet zdrojové kódy

1、解决配置文件乱码
2、优化关键词查询

rayson před 1 rokem
rodič
revize
02341335a0

+ 4 - 4
src/main/java/com/wechat/controller/EnterpriseController.java

@@ -3,7 +3,7 @@ package com.wechat.controller;
 import com.wechat.global.CustomException;
 import com.wechat.global.message.InfoMsg;
 import com.wechat.model.requestDto.*;
-import com.wechat.model.responseDto.AlreadyPublishPositionResp;
+import com.wechat.model.responseDto.AlreadyPublishJobResp;
 import com.wechat.model.responseDto.AlreadyPublishResp;
 import com.wechat.model.responseDto.ContactUserInfoResp;
 import com.wechat.model.responseDto.ResultEntity;
@@ -271,10 +271,10 @@ public class EnterpriseController {
      * @author rayson
      * @date 2023-09-19 14:34
      **/
-    @RequestMapping(value = "alreadyPublishPositionList", method = RequestMethod.POST)
+    @RequestMapping(value = "alreadyPublishJobList", method = RequestMethod.POST)
     @ResponseBody
-    public ResultEntity<List<AlreadyPublishPositionResp>> alreadyPublishPositionList(HttpServletRequest req) {
-        return new ResultEntity<>(InfoMsg.SUCCESS_REQUEST, enterpriseService.alreadyPublishPositionList(req));
+    public ResultEntity<List<AlreadyPublishJobResp>> alreadyPublishJobList(HttpServletRequest req) {
+        return new ResultEntity<>(InfoMsg.SUCCESS_REQUEST, enterpriseService.alreadyPublishJobList(req));
     }
 
 

+ 3 - 3
src/main/java/com/wechat/dao/MdeJobAdvertisedDao.java

@@ -14,7 +14,7 @@ import com.wechat.model.dto.JobAdvertisedListDto;
 import com.wechat.model.dto.JobRepFormPvDto;
 import com.wechat.model.dto.ShowOfJobsDto;
 import com.wechat.model.requestDto.AdJobCvNumReq;
-import com.wechat.model.responseDto.AlreadyPublishPositionResp;
+import com.wechat.model.responseDto.AlreadyPublishJobResp;
 import com.wechat.model.responseDto.JobAdvertisedNologinResp;
 import com.wechat.model.responseDto.JobAdvertisedRes;
 import com.wechat.model.responseDto.JobAdvertisedResp;
@@ -306,8 +306,8 @@ public class MdeJobAdvertisedDao extends BaseDao {
      * @date 2023-09-19 14:34
      * @return PagingResult<AlreadyPublishPositionResp>
      **/
-    public List<AlreadyPublishPositionResp> alreadyPublishPositionList(Map<String,Object> map) {
-        return super.select("MdeJobAdvertisedMapper.alreadyPublishPositionList",map);
+    public List<AlreadyPublishJobResp> alreadyPublishJobList(Map<String,Object> map) {
+        return super.select("MdeJobAdvertisedMapper.alreadyPublishJobList",map);
 
     }
 

+ 5 - 6
src/main/java/com/wechat/model/requestDto/UserCvStatusReq.java

@@ -20,7 +20,7 @@ public class UserCvStatusReq {
 //	@NotNull(message = "不能为空|type not null")
 	private String type; // 简历类型
 
-	private String positionIdList; // 职位Id
+	private String jobIdList; // 职位Id
 
 	public Integer getIndex() {
 		
@@ -47,12 +47,11 @@ public class UserCvStatusReq {
 		this.type = type;
 	}
 
-	public String getPositionIdList() {
-		return positionIdList;
+	public String getJobIdList() {
+		return jobIdList;
 	}
 
-	public void setPositionIdList(String positionIdList) {
-		this.positionIdList = positionIdList;
+	public void setJobIdList(String jobIdList) {
+		this.jobIdList = jobIdList;
 	}
-
 }

+ 28 - 0
src/main/java/com/wechat/model/responseDto/AlreadyPublishJobResp.java

@@ -0,0 +1,28 @@
+package com.wechat.model.responseDto;
+
+/**
+ * @author rayson
+ * @description AlreadyPublishJobResp 已发布职位列表
+ * @create 2023-09-19 14:30
+ **/
+public class AlreadyPublishJobResp {
+
+    private String jobId; // 发布的工作Id
+    private String jobName; // 职位名称
+
+
+    public String getJobId() {
+        return jobId;
+    }
+
+    public void setJobId(String jobId) {
+        this.jobId = jobId;
+    }
+    public String getJobName() {
+        return jobName;
+    }
+
+    public void setJobName(String jobName) {
+        this.jobName = jobName;
+    }
+}

+ 0 - 28
src/main/java/com/wechat/model/responseDto/AlreadyPublishPositionResp.java

@@ -1,28 +0,0 @@
-package com.wechat.model.responseDto;
-
-/**
- * @author rayson
- * @description AlreadyPublishPositionResp 已发布职位列表
- * @create 2023-09-19 14:30
- **/
-public class AlreadyPublishPositionResp {
-
-    private String positionId; // 发布的工作Id
-    private String positionName; // 职位名称
-
-
-    public String getPositionId() {
-        return positionId;
-    }
-
-    public void setPositionId(String positionId) {
-        this.positionId = positionId;
-    }
-    public String getPositionName() {
-        return positionName;
-    }
-
-    public void setPositionName(String positionName) {
-        this.positionName = positionName;
-    }
-}

+ 7 - 7
src/main/java/com/wechat/service/EnterpriseService.java

@@ -17,7 +17,7 @@ import com.wechat.model.dbEntity.MdePositionCvRel;
 import com.wechat.model.dbEntity.MdeUser;
 import com.wechat.model.dto.UserInfoResp;
 import com.wechat.model.requestDto.*;
-import com.wechat.model.responseDto.AlreadyPublishPositionResp;
+import com.wechat.model.responseDto.AlreadyPublishJobResp;
 import com.wechat.model.responseDto.ContactUserInfoResp;
 import com.wechat.model.responseDto.JobAdvertisedResp;
 import com.wechat.model.responseDto.ResultEntity;
@@ -448,13 +448,13 @@ public class EnterpriseService extends BaseService {
         Map<String, Object> maps = Maps.newHashMap();
         Pagination pagination = new Pagination(statusReq.getIndex(), statusReq.getSize());
         Map<Object, Object> params = Maps.newHashMap();
-        List<String> positionIdList = null;
-        if (StringsUtils.isNotEmpty(statusReq.getPositionIdList())) {
-            positionIdList = Arrays.asList(statusReq.getPositionIdList().split(","));
+        List<String> jobIdList = null;
+        if (StringsUtils.isNotEmpty(statusReq.getJobIdList())) {
+            jobIdList = Arrays.asList(statusReq.getJobIdList().split(","));
         }
         String userCode = commonService.getUserCode(req);
         String lang = commonService.getLanguage(req);
-        params.put("positionIdList", positionIdList);
+        params.put("jobIdList", jobIdList);
         params.put("lang", lang);
         params.put("publisher", userCode);
         params.put("model", model);
@@ -656,11 +656,11 @@ public class EnterpriseService extends BaseService {
      * @author rayson
      * @date 2023-09-19 14:34
      **/
-    public List<AlreadyPublishPositionResp> alreadyPublishPositionList(HttpServletRequest req) {
+    public List<AlreadyPublishJobResp> alreadyPublishJobList(HttpServletRequest req) {
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("userCode", commonService.getUserCode(req));
         map.put("lang", commonService.getLanguage(req));
-        return mdeJobAdvertisedDao.alreadyPublishPositionList(map);
+        return mdeJobAdvertisedDao.alreadyPublishJobList(map);
     }
 
 

+ 81 - 81
src/main/resources/conf.local.properties

@@ -1,4 +1,4 @@
-#weixin ???
+#weixin 公众号
 token=RdkcWechatToken2016
 weixin.appid=wx700ad9bf40b511db
 weixin.secret=2a8ac1cb6266187fdb9527d40e73c4b9
@@ -19,78 +19,78 @@ weixin.userinfo=https://api.weixin.qq.com/cgi-bin/user/info?access_token={0}&ope
 weixin.userinfo.list=https://api.weixin.qq.com/cgi-bin/user/info/batchget?access_token={0}
 weixin.menu=https://api.weixin.qq.com/cgi-bin/menu/create?access_token={0}
 weixin.shorturl=https://api.weixin.qq.com/cgi-bin/shorturl?access_token={0}
-#????
+#静默登陆
 weixin.authorization.code=https://open.weixin.qq.com/connect/oauth2/authorize?appid={0}&redirect_uri={1}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect
 
-#weixin ???
-#????
+#weixin 小程序
+#视频面试
 wx.miniprog.video.token=Mde1ht7eD@tIof8b.b86ugsQddt
 wx.miniprog.video.appid=wx2258c25589859d8c
 wx.miniprog.video.secret=a44c4fd22083ff735cd551415cb590c8
 wx.miniprog.video.tmsg.invite.url=pages/index/index
-#????????developer?????trial?????formal???????????
+#跳转小程序类型:developer为开发版;trial为体验版;formal为正式版;默认为正式版
 wx.miniprog.video.state=developer
 
-#??? ??
+#小程序 登录
 wx.miniprog.login.url=https://api.weixin.qq.com/sns/jscode2session?appid={0}&secret={1}&js_code={2}&grant_type=authorization_code
-#??? ????????????????
+#小程序 下发小程序和公众号统一的服务消息
 wx.miniprog.tplmsg.url=https://api.weixin.qq.com/cgi-bin/message/wxopen/template/uniform_send?access_token={0}
 
-#??????
+#腾讯即时视频
 wx.video.appid=1400384566
 wx.video.secret=656440f384e8de3272ff0d6f293d72e3bff67d9b3386d717abea8b2f1279774a
 
 
-#??
+#领英
 linkedIn.clientId=81fdbcw6p7kx2c
 linkedIn.clientSecret=4HJvFKhEuC4AUT9q
 linkedIn.grantType=authorization_code
 linkedIn.redirect_url=https://www.menduner.com/user/login
 linkedIn.UserURl=https://api.linkedin.com/v2/me?projection=(id)
 #linkedIn.UserURl=https://api.linkedin.com/v2/me?projection=(id,firstName,lastName,profilePicture(displayImage~:playableStreams))
-#????????
+#获取领英用户信息
 linkedIn.TokenUrl=https://www.linkedin.com/oauth/v2/accessToken
-#???????
+#分享动态到领英
 linkedIn.shareTrendToLinkedIn=https://api.linkedin.com/v1/people/~/shares?format=json
 
-#???????
+#微信第三方登录
 weixin.authorization.tokenUrl=https://api.weixin.qq.com/sns/oauth2/access_token?appid={0}&secret={1}&code={2}&grant_type=authorization_code
-#??????
+#微信开放平台
 weixin.open.appid=wxae181c656f9443fc
 weixin.open.secret=c3d39dea54f749c94a8b27a27b39e9ab
-#????????
+#获取微信用户信息
 weixin.authorization.userinfo=https://api.weixin.qq.com/sns/userinfo?access_token={0}&openid={1}&lang=zh_CN
-#???? (????)
+#微信推送 (接口地址)
 weixin.tmsg.send=https://api.weixin.qq.com/cgi-bin/message/template/send?access_token={0}
 
-##????
-#?????? ??
+##模板消息
+#职位邀请通知 推送
 position_template_id=NAXbtCr8VR71M78NWyPBpK_xASTMKDktb6H8zIgbOws
 position_url=https://www.menduner.com/#/mine/invitations/company
 
-#??????  ?? <??????>
+#面试邀请通知  推送 <面试安排提醒>
 interview_invitation_template_id=SVffJu9YWkXHd1_2hIS4tJU02msuVS4r0X3cCQr24zo
-#?????
+#公众号链接
 interview_invitation_url=https://www.menduner.com/#/mine/resume/delivery
-#?????
+#小程序链接
 interview.invitation.minp.url=pages/interDetail/interDetail?id={0}&jobName={1}&isCheck=1
 
-#????????  ?? <??????>
+#面试时间变更通知  推送 <预约更改提醒>
 interview.change.time.template.id=ioqHaLu4hJggfs09XCQWKYPh_eOKZbLcXBpQMo-38KI
-#?????
+#小程序链接
 interview.change.time.minp.url=pages/interDetail/interDetail?id={0}&jobName={1}&isCheck=1
 
-#????????  ?? <????????>
+#面试时间确认通知  推送 <面试时间确认通知>
 interview.confirm.time.template.id=vM2Oqqmxqnenrd6VyLMvwN-DziM17wTMPvYpV5xKZHw
-#?????
+#小程序链接
 interview.confirm.time.minp.url=pages/interDetail/interDetail?id={0}&jobName={1}&isCheck=0
 
-#??????  ?? <????????>
+#拒绝面试通知  推送 <拒绝面试邀请通知>
 interview.refuse.time.template.id=MoDQgpOLzEaaPGLdBs6ZkbV3wn1RTupYPzAZ3CVjGVg
-#?????
+#小程序链接
 interview.refuse.time.minp.url=pages/interDetail/interDetail?id={0}&jobName={1}&isCheck=0
 
-#??API
+#百度API
 baidu.grant.type=client_credentials
 baidu.client.id=C5L7K5jHUYBxgj9ZKGb5A33G
 baidu.client.secret=Vt23lBP1zFZN5URRtQ4fhpLsSGa6TNdj
@@ -102,7 +102,7 @@ weixin.jsapi.reTime=6800
 weixin.jsapi.ticket=https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token={0}&type=jsapi
 weixin.jsapi.signature=jsapi_ticket={0}&noncestr={1}&timestamp={2}&url={3}
 
-#token ????????
+#token 过期时间(分钟)
 token.expire.minute=120
 
 #reGet accessToke time
@@ -121,85 +121,85 @@ upload.path.html=htmls/
 upload.path.file=files/
 upload.path.card=card/
 upload.path.template=template/
-#????
+#企业相册
 upload.path.image.album=album/
-#???????
+#企业主页背景图
 upload.path.image.centerBg=centerBg/
-#????
+#临时文件
 upload.path.image.temporary=temporary/
-#????
+#在职证明
 upload.path.image.onjob=onjob/
 
 upload.refund.path=refund/
 upload.qrcode.path=qrcode/
 
 
-#????????
+#默认请求每页数量
 default.request.page.size=10
-#????????
+#好友动态每页数量
 trends.friendTrends.limitSize=5
-#???? ????,???? ???????
+#好友动态 发布动态,修改资料 距离今天的天数
 trends.friendTrendsWithLimit.limitDay=7
-#??????????
+#可能认识的人每页数量
 user.maybeFriends.limitSize=6
-#???? ????
+#优选人才 每页数量
 user.superiorTalenRetrieval.limitSize=5
-#???? ????
+#推荐人才 每页数量
 user.recommentTalenRetrieval.limitSize=5
-#??????  ????????
+#用户详细信息  我的动态显示数量
 user.detail.myTrends.limitSize=3
-#????????
+#推荐职位每页数量
 job.recommendJobs.limitSize=5
-#????????
+#相似职位每页数量
 job.similarJobs.limitSize=5
-#??????????
+#酒店其他职位每页数量
 job.hotelOtherPosition.limitSize=5
-#????????
+#推荐酒店每页数量
 hotel.recommentHotels.limitSize=5
-#????????
+#相似酒店每页数量
 hotel.similarHotels.limitSize=5
-#????????
+#我的好友每页数量
 friends.myFriends.limitSize=6
-# ????????
+# 图片压缩大小控制
 compress.image.size=500
 
 #sms
 sms.appID=1400097875
 sms.appkey=c434c99479419bd8b3b3c4cb517c6753
-#????????????
+#普通短信模板(中国大陆)
 sms.templateId=438082
-#??????????
+#普通短信模板(国际)
 sms.templateId_en=179748
-#????????????
+#短信验证码过期时间(秒)
 sms.phoneCode.expirationTime=600
-sms.sign=???
+sms.sign=门墩儿
 sms.sign.en=Menduner
-#????????Id
+#企业汇款短信模板Id
 sms.sendRemit.templateId=165764
-#????????Id ??????
+#企业邀请短信模板Id (中国大陆)
 sms.invitation.templateId=179431
-#????????Id ????
+#企业邀请短信模板Id (国际)
 sms.international.invitation.templateId=179744
-#????????Id
+#企业邀请面试短信Id
 sms.interview.cn=727003
 sms.interview.en=727003
-#????????
+#预约时间修改通知
 sms.intv.time.upd=730206
-#????????
+#预约时间确认通知
 sms.intv.time.ok=730218
-#????
+#拒绝面试
 sms.intv.refuse=743398
 
 #order
-default.invoiceContent=???
-default.accountName=??????????????
-default.openingBank=?????????????????
+default.invoiceContent=咨询费
+default.accountName=苏州识喜识谊信息科技有限公司
+default.openingBank=招商银行股份有限公司苏州独墅湖支行
 default.account=512908229410902
 
 default.invoiceContent_en=Consulting fee
 default.accountName_en=Suzhou Shixi Shiyi Hotel Management Co., Ltd.
 default.openingBank_en=China Merchants Bank Suzhou Dushu Lake Branch
-#????
+#默认运费
 default.freight=0
 
 #AliPay
@@ -215,54 +215,54 @@ AliPay.gatewayUrl=https://openapi.alipay.com/gateway.do
 #WXpay.appId=wx848cc247559f92f3
 WXpay.appKey=b1HxwCuWLfQIzuilI1ayBTTiXOBfEeMg
 #WXpay.appSecret=220609861baa9d70bc0576f382eb02aa
-#???
+#商户号
 WXpay.mchId=1505499481
-#????
+#回调地址
 WXpay.notifyUrl={0}RecruitmentApi/order/weChat_notify_url
-#code????
+#code回调地址
 WXpay.codeUrl={0}RecruitmentApi/order/weChat_code_url
 
 
-#????????
+#企业注册激活连接
 enterprise.register.activeUrl={0}RecruitmentApi/login/activation
-#??????????url
+#邮件激活跳转静态页面url
 enterprise.mail.activation.redirectUrl=https://www.menduner.com/#/emailTip
 
-#??????????, ???? (??)
-#enterprise.mail.companyName=??????????????
-#enterprise.mail.checkStatusName=?????
+#企业注册发送激活连接, 内容配置 (废弃)
+#enterprise.mail.companyName=苏州识喜识谊酒店管理有限公司
+#enterprise.mail.checkStatusName=审核待通过
 #enterprise.mail.addMessage=xxx
 
-#?????? ??????
+#企业线下支付 最终付款期限
 deadline_payment=10
-#???????
+#审核人邮箱地址
 auditor_email_address=peter.pan@menduner.com
 
-#??????
+#注册发送邮件
 send_email_address=services@menduner.com
 send_email_password=I2x6hZzeWHOXptpR
-#?????5??
+#图形验证码5分钟
 captcha.expirationTime=300
 
-#????????????
+#五天之内不可投递同一职位
 position_five_day_whin=5
 
-#????????(?? 604800 )
+#基础数据失效时间(一周 604800 )
 base_data_expired_second=60
 
-#????????????
+#非付费企业月可发职位次数
 unvip_release_no=2
 
-#???VIP??????
+#限制非VIP企业启动时间
 unvip_discount_date=2020-01-01
 
-#PV/UV??????(?? 7? )
+#PV/UV记录失效时间(一周 7天 )
 pvuv.expired.days=7
 
 #thymeleaf
 spring.thymeleaf.encoding=UTF-8  
 spring.thymeleaf.suffix=.html  
-#??????
+#默认严格检查
 #spring.thymeleaf.mode=HTML5
-#?????
-docx4j-ImportXHTML.Element.Heading.MapToStyle=true
+#非严格检查
+docx4j-ImportXHTML.Element.Heading.MapToStyle=true

+ 83 - 83
src/main/resources/conf.prod.properties

@@ -1,4 +1,4 @@
-#weixin ???
+#weixin 公众号
 token=
 weixin.appid=wx848cc247559f92f3
 weixin.secret=220609861baa9d70bc0576f382eb02aa
@@ -13,78 +13,78 @@ weixin.userinfo=https://api.weixin.qq.com/cgi-bin/user/info?access_token={0}&ope
 weixin.userinfo.list=https://api.weixin.qq.com/cgi-bin/user/info/batchget?access_token={0}
 weixin.menu=https://api.weixin.qq.com/cgi-bin/menu/create?access_token={0}
 weixin.shorturl=https://api.weixin.qq.com/cgi-bin/shorturl?access_token={0}
-#????
+#静默登陆
 weixin.authorization.code=https://open.weixin.qq.com/connect/oauth2/authorize?appid={0}&redirect_uri={1}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect
 
-#weixin ???
-#????
+#weixin 小程序
+#视频面试
 wx.miniprog.video.token=Mde1ht7eD@tIof8b.b86ugsQddt
 wx.miniprog.video.appid=wx2258c25589859d8c
 wx.miniprog.video.secret=a44c4fd22083ff735cd551415cb590c8
 wx.miniprog.video.tmsg.invite.url=pages/index/index
-#????????developer?????trial?????formal???????????
+#跳转小程序类型:developer为开发版;trial为体验版;formal为正式版;默认为正式版
 wx.miniprog.video.state=formal
 
-#??? ??
+#小程序 登录
 wx.miniprog.login.url=https://api.weixin.qq.com/sns/jscode2session?appid={0}&secret={1}&js_code={2}&grant_type=authorization_code
-#??? ????????????????
+#小程序 下发小程序和公众号统一的服务消息
 wx.miniprog.tplmsg.url=https://api.weixin.qq.com/cgi-bin/message/wxopen/template/uniform_send?access_token={0}
 
-#??????
+#腾讯即时视频
 wx.video.appid=1400384566
 wx.video.secret=656440f384e8de3272ff0d6f293d72e3bff67d9b3386d717abea8b2f1279774a
 
 
-#???????
+#领英第三方登录
 linkedIn.clientId=81fdbcw6p7kx2c
 linkedIn.clientSecret=4HJvFKhEuC4AUT9q
 linkedIn.grantType=authorization_code
 linkedIn.redirect_url=https://www.menduner.com/user/login
 linkedIn.UserURl=https://api.linkedin.com/v2/me?projection=(id)
-#????????
+#获取领英用户信息
 linkedIn.TokenUrl=https://www.linkedin.com/oauth/v2/accessToken
-#???????
+#分享动态到领英
 linkedIn.shareTrendToLinkedIn=https://api.linkedin.com/v1/people/~/shares?format=json
 
-#???????
+#微信第三方登录
 weixin.authorization.tokenUrl=https://api.weixin.qq.com/sns/oauth2/access_token?appid={0}&secret={1}&code={2}&grant_type=authorization_code
-#??????
+#微信开放平台
 weixin.open.appid=wxae181c656f9443fc
 weixin.open.secret=c3d39dea54f749c94a8b27a27b39e9ab
-#????????
+#获取微信用户信息
 weixin.authorization.userinfo=https://api.weixin.qq.com/sns/userinfo?access_token={0}&openid={1}&lang=zh_CN
 
-#???? (????)
+#微信推送 (接口地址)
 weixin.tmsg.send=https://api.weixin.qq.com/cgi-bin/message/template/send?access_token={0}
 
-##????
-#?????? ??
+##模板消息
+#职位邀请通知 推送
 position_template_id=NAXbtCr8VR71M78NWyPBpK_xASTMKDktb6H8zIgbOws
 position_url=https://www.menduner.com/#/mine/invitations/company
 
-#??????  ?? <??????>
+#面试邀请通知  推送 <面试安排提醒>
 interview_invitation_template_id=SVffJu9YWkXHd1_2hIS4tJU02msuVS4r0X3cCQr24zo
-#?????
+#公众号链接
 interview_invitation_url=https://www.menduner.com/#/mine/resume/delivery
-#?????
+#小程序链接
 interview.invitation.minp.url=pages/interDetail/interDetail?id={0}&jobName={1}&isCheck=1
 
-#????????  ?? <??????>
+#面试时间变更通知  推送 <预约更改提醒>
 interview.change.time.template.id=ioqHaLu4hJggfs09XCQWKYPh_eOKZbLcXBpQMo-38KI
-#?????
+#小程序链接
 interview.change.time.minp.url=pages/interDetail/interDetail?id={0}&jobName={1}&isCheck=1
 
-#????????  ?? <????????>
+#面试时间确认通知  推送 <面试时间确认通知>
 interview.confirm.time.template.id=vM2Oqqmxqnenrd6VyLMvwN-DziM17wTMPvYpV5xKZHw
-#?????
+#小程序链接
 interview.confirm.time.minp.url=pages/interDetail/interDetail?id={0}&jobName={1}&isCheck=0
 
-#??????  ?? <??????>
+#拒绝面试通知  推送 <面试拒绝提醒>
 interview.refuse.time.template.id=MoDQgpOLzEaaPGLdBs6ZkbV3wn1RTupYPzAZ3CVjGVg
-#?????
+#小程序链接
 interview.refuse.time.minp.url=pages/interDetail/interDetail?id={0}&jobName={1}&isCheck=0
 
-#??API
+#百度API
 baidu.grant.type=client_credentials
 baidu.client.id=C5L7K5jHUYBxgj9ZKGb5A33G
 baidu.client.secret=Vt23lBP1zFZN5URRtQ4fhpLsSGa6TNdj
@@ -96,102 +96,102 @@ weixin.jsapi.reTime=6800
 weixin.jsapi.ticket=https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token={0}&type=jsapi
 weixin.jsapi.signature=jsapi_ticket={0}&noncestr={1}&timestamp={2}&url={3}
 
-#token ????????
+#token 过期时间(分钟)
 token.expire.minute=180
 
 #reGet accessToke time
 weixin.reTime=4800
 
-#???
+#主域名
 url.base=https://www.menduner.com/
 
-#????????, ?????????userfiles?
-#???userfiles.basedir????
+#上传文件绝对路径, 路径中不允许包含“userfiles”
+#和后台userfiles.basedir配置一致
 upload.base.path=/data/uploadfiles/
 upload.path.image=images/
 upload.path.html=htmls/
 upload.path.file=files/
 upload.path.card=card/
 upload.path.template=template/
-#????
+#企业相册
 upload.path.image.album=album/
-#???????
+#企业主页背景图
 upload.path.image.centerBg=centerBg/
-#????
+#临时文件
 upload.path.image.temporary=temporary/
-#????
+#在职证明
 upload.path.image.onjob=onjob/
 
 upload.refund.path=refund/
 upload.qrcode.path=qrcode/
 
 
-#????????
+#默认请求每页数量
 default.request.page.size=10
-#????????
+#好友动态每页数量
 trends.friendTrends.limitSize=5
-#???? ????,???? ???????
+#好友动态 发布动态,修改资料 距离今天的天数
 trends.friendTrendsWithLimit.limitDay=7
-#??????????
+#可能认识的人每页数量
 user.maybeFriends.limitSize=6
-#???? ????
+#优选人才 每页数量
 user.superiorTalenRetrieval.limitSize=5
-#???? ????
+#推荐人才 每页数量
 user.recommentTalenRetrieval.limitSize=5
-#??????  ????????
+#用户详细信息  我的动态显示数量
 user.detail.myTrends.limitSize=3
-#????????
+#推荐职位每页数量
 job.recommendJobs.limitSize=5
-#????????
+#相似职位每页数量
 job.similarJobs.limitSize=5
-#??????????
+#酒店其他职位每页数量
 job.hotelOtherPosition.limitSize=5
-#????????
+#推荐酒店每页数量
 hotel.recommentHotels.limitSize=5
-#????????
+#相似酒店每页数量
 hotel.similarHotels.limitSize=5
-#????????
+#我的好友每页数量
 friends.myFriends.limitSize=6
-# ????????
+# 图片压缩大小控制
 compress.image.size=600
 
 #sms
 sms.appID=1400097875
 sms.appkey=c434c99479419bd8b3b3c4cb517c6753
-#????????????
+#普通短信模板(中国大陆)
 sms.templateId=438082
-#??????????
+#普通短信模板(国际)
 sms.templateId_en=179748
-#????????????
+#短信验证码过期时间(秒)
 sms.phoneCode.expirationTime=600
-sms.sign=???
+sms.sign=门墩儿
 sms.sign.en=Menduner
-#????????Id
+#企业汇款短信模板Id
 sms.sendRemit.templateId=165764
-#????????Id ??????
+#企业邀请短信模板Id (中国大陆)
 sms.invitation.templateId=179431
-#????????Id ????
+#企业邀请短信模板Id (国际)
 sms.international.invitation.templateId=179744
-#????????Id
+#企业邀请面试短信Id
 sms.interview.cn=727003
 sms.interview.en=727003
-#????????
+#预约时间修改通知
 sms.intv.time.upd=730206
-#????????
+#预约时间确认通知
 sms.intv.time.ok=730218
-#????
+#拒绝面试
 sms.intv.refuse=743398
 
 #order
-default.invoiceContent=???
-default.accountName=??????????????
-default.openingBank=?????????????????
+default.invoiceContent=咨询费
+default.accountName=苏州识喜识谊信息科技有限公司
+default.openingBank=招商银行股份有限公司苏州独墅湖支行
 default.account=512908229410902
 
 default.invoiceContent_en=Consulting fee
 default.accountName_en=Suzhou Shixi Shiyi Information Technology Co., Ltd.
 default.openingBank_en=China Merchants Bank Suzhou Dushu Lake Branch
-#????
+#默认运费
 default.freight=0
 
 #AliPay
@@ -206,49 +206,49 @@ AliPay.gatewayUrl=https://openapi.alipay.com/gateway.do
 
 #WeChatPay
 WXpay.appKey=b1HxwCuWLfQIzuilI1ayBTTiXOBfEeMg
-#???id
+#公众号id
 WXpay.appid=wx848cc247559f92f3
 WXpay.appSecret=220609861baa9d70bc0576f382eb02aa
-#???
+#商户号
 WXpay.mchId=1505499481
-#????
+#回调地址
 WXpay.notifyUrl={0}RecruitmentApi/order/weChat_notify_url
-#code????
+#code回调地址
 WXpay.codeUrl={0}RecruitmentApi/order/weChat_code_url
 
-#????????
+#企业注册激活连接
 enterprise.register.activeUrl={0}RecruitmentApi/login/activation
-#??????????url
+#邮件激活跳转静态页面url
 enterprise.mail.activation.redirectUrl=https://www.menduner.com/#/emailTip
-#??????????, ????
-#enterprise.mail.companyName=??????????????
-#enterprise.mail.checkStatusName=?????
+#企业注册发送激活连接, 内容配置
+#enterprise.mail.companyName=苏州识喜识谊酒店管理有限公司
+#enterprise.mail.checkStatusName=审核待通过
 #enterprise.mail.addMessage=xxx
 
-#?????? ??????
+#企业线下支付 最终付款期限
 deadline_payment=10
 
-#???????
+#审核人邮箱地址
 auditor_email_address=peter.pan@menduner.com
 
-#??????
+#注册发送邮件
 send_email_address=services@menduner.com
 send_email_password=I2x6hZzeWHOXptpR
 
-#?????5??
+#图形验证码5分钟
 captcha.expirationTime=300
 
-#????????????
+#五天之内不可投递同一职位
 position_five_day_whin=30
 
-#????????(??)
+#基础数据失效时间(一周)
 base_data_expired_second=604800
 
-#???????????
+#非付费企业可发职位次数
 unvip_release_no=3
 
-#???VIP?????? now>
+#限制非VIP企业启动时间 now>
 unvip_discount_date=2020-04-30
 
-#PV/UV??????(?? 7? )
-pvuv.expired.days=7
+#PV/UV记录失效时间(一周 7天 )
+pvuv.expired.days=7

+ 83 - 83
src/main/resources/conf.test.properties

@@ -1,4 +1,4 @@
-#weixin ???
+#weixin 公众号
 token=
 weixin.appid=wx700ad9bf40b511db
 weixin.secret=2a8ac1cb6266187fdb9527d40e73c4b9
@@ -15,78 +15,78 @@ weixin.userinfo=https://api.weixin.qq.com/cgi-bin/user/info?access_token={0}&ope
 weixin.userinfo.list=https://api.weixin.qq.com/cgi-bin/user/info/batchget?access_token={0}
 weixin.menu=https://api.weixin.qq.com/cgi-bin/menu/create?access_token={0}
 weixin.shorturl=https://api.weixin.qq.com/cgi-bin/shorturl?access_token={0}
-#????
+#静默登陆
 weixin.authorization.code=https://open.weixin.qq.com/connect/oauth2/authorize?appid={0}&redirect_uri={1}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect
 
 
-#weixin ???
-#????
+#weixin 小程序
+#视频面试
 wx.miniprog.video.token=Mde1ht7eD@tIof8b.b86ugsQddt
 wx.miniprog.video.appid=wx2258c25589859d8c
 wx.miniprog.video.secret=a44c4fd22083ff735cd551415cb590c8
 wx.miniprog.video.tmsg.invite.url=pages/index/index
-#????????developer?????trial?????formal???????????
+#跳转小程序类型:developer为开发版;trial为体验版;formal为正式版;默认为正式版
 wx.miniprog.video.state=trial
 
-#??? ??
+#小程序 登录
 wx.miniprog.login.url=https://api.weixin.qq.com/sns/jscode2session?appid={0}&secret={1}&js_code={2}&grant_type=authorization_code
-#??? ????????????????
+#小程序 下发小程序和公众号统一的服务消息
 wx.miniprog.tplmsg.url=https://api.weixin.qq.com/cgi-bin/message/wxopen/template/uniform_send?access_token={0}
 
-#??????
+#腾讯即时视频
 wx.video.appid=1400384566
 wx.video.secret=656440f384e8de3272ff0d6f293d72e3bff67d9b3386d717abea8b2f1279774a
 
-#???????
+#领英第三方登录
 linkedIn.clientId=81fdbcw6p7kx2c
 linkedIn.clientSecret=4HJvFKhEuC4AUT9q
 linkedIn.grantType=authorization_code
 linkedIn.redirect_url=https://test.menduner.com/user/login
 linkedIn.UserURl=https://api.linkedin.com/v2/me?projection=(id)
-#????????
+#获取领英用户信息
 linkedIn.TokenUrl=https://www.linkedin.com/oauth/v2/accessToken
-#???????
+#分享动态到领英
 linkedIn.shareTrendToLinkedIn=https://api.linkedin.com/v1/people/~/shares?format=json
 
-#???????
+#微信第三方登录
 weixin.authorization.tokenUrl=https://api.weixin.qq.com/sns/oauth2/access_token?appid={0}&secret={1}&code={2}&grant_type=authorization_code
-#??????
+#微信开放平台
 weixin.open.appid=wxae181c656f9443fc
 weixin.open.secret=c3d39dea54f749c94a8b27a27b39e9ab
-#????????
+#获取微信用户信息
 weixin.authorization.userinfo=https://api.weixin.qq.com/sns/userinfo?access_token={0}&openid={1}&lang=zh_CN
 
-#???? (????)
+#微信推送 (接口地址)
 weixin.tmsg.send=https://api.weixin.qq.com/cgi-bin/message/template/send?access_token={0}
 
-##????
-#?????? ??
+##模板消息
+#职位邀请通知 推送
 position_template_id=NAXbtCr8VR71M78NWyPBpK_xASTMKDktb6H8zIgbOws
 position_url=https://test.menduner.com/#/mine/invitations/company
 
-#??????  ?? <??????>
+#面试邀请通知  推送 <面试安排提醒>
 interview_invitation_template_id=SVffJu9YWkXHd1_2hIS4tJU02msuVS4r0X3cCQr24zo
-#?????
+#公众号链接
 interview_invitation_url=https://www.menduner.com/#/mine/resume/delivery
-#?????
+#小程序链接
 interview.invitation.minp.url=pages/interDetail/interDetail?id={0}&jobName={1}&isCheck=1
 
-#????????  ?? <??????>
+#面试时间变更通知  推送 <预约更改提醒>
 interview.change.time.template.id=ioqHaLu4hJggfs09XCQWKYPh_eOKZbLcXBpQMo-38KI
-#?????
+#小程序链接
 interview.change.time.minp.url=pages/interDetail/interDetail?id={0}&jobName={1}&isCheck=1
 
-#????????  ?? <????????>
+#面试时间确认通知  推送 <面试时间确认通知>
 interview.confirm.time.template.id=vM2Oqqmxqnenrd6VyLMvwN-DziM17wTMPvYpV5xKZHw
-#?????
+#小程序链接
 interview.confirm.time.minp.url=pages/interDetail/interDetail?id={0}&jobName={1}&isCheck=0
 
-#??????  ?? <??????>
+#拒绝面试通知  推送 <面试拒绝提醒>
 interview.refuse.time.template.id=MoDQgpOLzEaaPGLdBs6ZkbV3wn1RTupYPzAZ3CVjGVg
-#?????
+#小程序链接
 interview.refuse.time.minp.url=pages/interDetail/interDetail?id={0}&jobName={1}&isCheck=0
 
-#??API
+#百度API
 baidu.grant.type=client_credentials
 baidu.client.id=C5L7K5jHUYBxgj9ZKGb5A33G
 baidu.client.secret=Vt23lBP1zFZN5URRtQ4fhpLsSGa6TNdj
@@ -98,102 +98,102 @@ weixin.jsapi.reTime=6800
 weixin.jsapi.ticket=https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token={0}&type=jsapi
 weixin.jsapi.signature=jsapi_ticket={0}&noncestr={1}&timestamp={2}&url={3}
 
-#token ????????
+#token 过期时间(分钟)
 token.expire.minute=180
 
 #reGet accessToke time
 weixin.reTime=4800
 
-#???
+#主域名
 url.base=https://test.menduner.com/
 
-#????????, ?????????userfiles?
-#???userfiles.basedir????
+#上传文件绝对路径, 路径中不允许包含“userfiles”
+#和后台userfiles.basedir配置一致
 upload.base.path=/data/uploadfiles/test/
 upload.path.image=images/
 upload.path.html=htmls/
 upload.path.file=files/
 upload.path.card=card/
 upload.path.template=template/
-#????
+#企业相册
 upload.path.image.album=album/
-#???????
+#企业主页背景图
 upload.path.image.centerBg=centerBg/
-#????
+#临时文件
 upload.path.image.temporary=temporary/
-#????
+#在职证明
 upload.path.image.onjob=onjob/
 
 upload.refund.path=refund/
 upload.qrcode.path=qrcode/
 
 
-#????????
+#默认请求每页数量
 default.request.page.size=10
-#????????
+#好友动态每页数量
 trends.friendTrends.limitSize=5
-#???? ????,???? ???????
+#好友动态 发布动态,修改资料 距离今天的天数
 trends.friendTrendsWithLimit.limitDay=7
-#??????????
+#可能认识的人每页数量
 user.maybeFriends.limitSize=6
-#???? ????
+#优选人才 每页数量
 user.superiorTalenRetrieval.limitSize=5
-#???? ????
+#推荐人才 每页数量
 user.recommentTalenRetrieval.limitSize=5
-#??????  ????????
+#用户详细信息  我的动态显示数量
 user.detail.myTrends.limitSize=3
-#????????
+#推荐职位每页数量
 job.recommendJobs.limitSize=5
-#????????
+#相似职位每页数量
 job.similarJobs.limitSize=5
-#??????????
+#酒店其他职位每页数量
 job.hotelOtherPosition.limitSize=5
-#????????
+#推荐酒店每页数量
 hotel.recommentHotels.limitSize=5
-#????????
+#相似酒店每页数量
 hotel.similarHotels.limitSize=5
-#????????
+#我的好友每页数量
 friends.myFriends.limitSize=6
-# ????????
+# 图片压缩大小控制
 compress.image.size=600
 
 #sms
 sms.appID=1400097875
 sms.appkey=c434c99479419bd8b3b3c4cb517c6753
-#????????????
+#普通短信模板(中国大陆)
 sms.templateId=438082
-#??????????
+#普通短信模板(国际)
 sms.templateId_en=179748
-#????????????
+#短信验证码过期时间(秒)
 sms.phoneCode.expirationTime=600
-sms.sign=???
+sms.sign=门墩儿
 sms.sign.en=Menduner
-#????????Id
+#企业汇款短信模板Id
 sms.sendRemit.templateId=165764
-#????????Id ??????
+#企业邀请短信模板Id (中国大陆)
 sms.invitation.templateId=179431
-#????????Id ????
+#企业邀请短信模板Id (国际)
 sms.international.invitation.templateId=179744
-#????????Id
+#企业邀请面试短信Id
 sms.interview.cn=727003
 sms.interview.en=727003
-#????????
+#预约时间修改通知
 sms.intv.time.upd=730206
-#????????
+#预约时间确认通知
 sms.intv.time.ok=730218
-#????
+#拒绝面试
 sms.intv.refuse=743398
 
 #order
-default.invoiceContent=???
-default.accountName=??????????????
-default.openingBank=?????????????????
+default.invoiceContent=咨询费
+default.accountName=苏州识喜识谊信息科技有限公司
+default.openingBank=招商银行股份有限公司苏州独墅湖支行
 default.account=512908229410902
 
 default.invoiceContent_en=Consulting fee
 default.accountName_en=Suzhou Shixi Shiyi Information Technology Co., Ltd.
 default.openingBank_en=China Merchants Bank Suzhou Dushu Lake Branch
-#????
+#默认运费
 default.freight=0
 
 
@@ -209,49 +209,49 @@ AliPay.gatewayUrl=https://openapi.alipay.com/gateway.do
 #WeChatPay
 WXpay.appKey=b1HxwCuWLfQIzuilI1ayBTTiXOBfEeMg
 
-#???id
+#公众号id
 WXpay.appid=wx848cc247559f92f3
 WXpay.appSecret=220609861baa9d70bc0576f382eb02aa
-#???
+#商户号
 WXpay.mchId=1505499481
-#????
+#回调地址
 WXpay.notifyUrl=https://www.menduner.com/RecruitmentApi/order/weChat_notify_url
-#code????
+#code回调地址
 WXpay.codeUrl={0}RecruitmentApi/order/weChat_code_url
 
-#????????
+#企业注册激活连接
 enterprise.register.activeUrl={0}RecruitmentApi/login/activation
-#??????????url
+#邮件激活跳转静态页面url
 enterprise.mail.activation.redirectUrl=https://test.menduner.com/#/emailTip
-#??????????, ????
-#enterprise.mail.companyName=??????????????
-#enterprise.mail.checkStatusName=?????
+#企业注册发送激活连接, 内容配置
+#enterprise.mail.companyName=苏州识喜识谊酒店管理有限公司
+#enterprise.mail.checkStatusName=审核待通过
 #enterprise.mail.addMessage=xxx
 
-#?????? ??????
+#企业线下支付 最终付款期限
 deadline_payment=10
 
-#???????
+#审核人邮箱地址
 auditor_email_address=peter.pan@menduner.com
 
-#??????
+#注册发送邮件
 send_email_address=services@menduner.com
 send_email_password=I2x6hZzeWHOXptpR
 
-#?????5??
+#图形验证码5分钟
 captcha.expirationTime=300
 
-#????????????
+#五天之内不可投递同一职位
 position_five_day_whin=5
 
-#????????(??)
+#基础数据失效时间(一周)
 base_data_expired_second=604800
 
-#????????????
+#非付费企业月可发职位次数
 unvip_release_no=2
 
-#???VIP??????
+#限制非VIP企业启动时间
 unvip_discount_date=2020-01-14
 
-#PV/UV??????(?? 7? )
-pvuv.expired.days=7
+#PV/UV记录失效时间(一周 7天 )
+pvuv.expired.days=7

+ 32 - 19
src/main/resources/mybatis/MdeJobAdvertisedMapper.xml

@@ -714,15 +714,18 @@
         FROM mde_job_advertised a
         <include refid="userLeftJoin"/><!-- mde_user u -->
         <include refid="arealeftJoin"/><!-- sys_area s1,s2,s3 -->
-        inner join MDE_POSITION pos
+        INNER JOIN MDE_POSITION pos
         on pos.POSITION_ID = a.POSITION_ID
-        left join MDE_VIEW_JOB_PUV_ALL puvView
+        LEFT JOIN MDE_VIEW_JOB_PUV_ALL puvView
         on puvView.JOB_ID = a.JOB_ID
+        LEFT JOIN MDE_POSITION_ANOTHER_NAME	mpa
+        on mpa.POSITION_ID = a.POSITION_ID
         <where>
             a.del_flag = 0
             and a.job_status = 0
             AND u.del_flag = 0
             AND u.IDENTITY_FLAG = 1
+            AND mpa.DEL_FLAG =0
             <if test="keyWord !=null">
                 AND
                 (
@@ -735,28 +738,38 @@
                     MATCH( s2.NAME,s2.NAME_EN) AGAINST(#{keyWord} IN BOOLEAN MODE)
                     or
                     MATCH( s3.NAME,s3.NAME_EN) AGAINST(#{keyWord} IN BOOLEAN MODE)
+                    OR
+                    MATCH (pos.POSITION_NAME_CN, pos.POSITION_NAME_EN ) AGAINST (#{keyWord} IN BOOLEAN MODE )
+                    OR
+                    MATCH ( mpa.POSITION_NAME ) AGAINST (#{keyWord} IN BOOLEAN MODE )
                 )
-                ORDER BY MATCH(a.JOB_NAME) AGAINST(#{keyWord} IN BOOLEAN MODE) desc
             </if>
+            GROUP BY a.JOB_ID
+            ORDER BY a.RECOMMEND_FLAG desc,a.update_date desc
         </where>
     </select>
 
     <!-- 职位关键词搜索(用户版) 统计-->
     <select id="searchPositionByKeyWordCount"  resultType="java.lang.Integer">
+        SELECT count(1) FROM
+        (
         SELECT
         count(1)
         FROM mde_job_advertised a
         <include refid="userLeftJoin"/><!-- mde_user u -->
         <include refid="arealeftJoin"/><!-- sys_area s1,s2,s3 -->
-        inner join MDE_POSITION pos
+        INNER JOIN MDE_POSITION pos
         on pos.POSITION_ID = a.POSITION_ID
-        left join MDE_VIEW_JOB_PUV_ALL puvView
+        LEFT JOIN MDE_VIEW_JOB_PUV_ALL puvView
         on puvView.JOB_ID = a.JOB_ID
+        LEFT JOIN MDE_POSITION_ANOTHER_NAME	mpa
+        on mpa.POSITION_ID = a.POSITION_ID
         <where>
             a.del_flag = 0
             and a.job_status = 0
             AND u.del_flag = 0
             AND u.IDENTITY_FLAG = 1
+            AND mpa.DEL_FLAG =0
             <if test="keyWord !=null">
                 AND
                 (
@@ -769,9 +782,14 @@
                     MATCH( s2.NAME,s2.NAME_EN) AGAINST(#{keyWord} IN BOOLEAN MODE)
                     or
                     MATCH( s3.NAME,s3.NAME_EN) AGAINST(#{keyWord} IN BOOLEAN MODE)
+                    OR
+                    MATCH (pos.POSITION_NAME_CN, pos.POSITION_NAME_EN ) AGAINST (#{keyWord} IN BOOLEAN MODE )
+                    OR
+                    MATCH ( mpa.POSITION_NAME ) AGAINST (#{keyWord} IN BOOLEAN MODE )
                 )
-                ORDER BY MATCH(a.JOB_NAME) AGAINST(#{keyWord} IN BOOLEAN MODE) desc
             </if>
+            GROUP BY a.JOB_ID
+            )as count
         </where>
     </select>
 
@@ -1056,27 +1074,22 @@
     </select>
 
     <!-- 获取发布的职位列表 -->
-    <select id="alreadyPublishPositionList" resultType="com.wechat.model.responseDto.AlreadyPublishPositionResp">
+    <select id="alreadyPublishJobList" resultType="com.wechat.model.responseDto.AlreadyPublishJobResp">
         SELECT
-        p.POSITION_ID AS positionId,
-        <choose>
-            <when test="lang=='en'.toString()">
-                p.POSITION_NAME_EN AS positionName
-            </when>
-            <otherwise>
-                p.POSITION_NAME_CN AS positionName
-            </otherwise>
-        </choose>
+            ad.JOB_ID as jobId,
+            ad.JOB_NAME AS jobName
         FROM
             mde_job_advertised ad
             left join mde_position p on ad.POSITION_ID = p.POSITION_ID
         WHERE
             ad.DEL_FLAG = 0
-        AND ad.PUBLISHER = #{userCode}
+            AND ad.PUBLISHER = #{userCode}
+            AND p.DEL_FLAG =0
         GROUP BY
-            ad.POSITION_ID
+            ad.JOB_NAME
         ORDER BY
-            ad.JOB_STATUS ASC
+            ad.JOB_STATUS ASC,
+            ad.UPDATE_DATE desc
     </select>
 
     <!-- 已发职位关键词检索 统计 -->

+ 6 - 6
src/main/resources/mybatis/MdePositionCvRelMapper.xml

@@ -491,9 +491,9 @@
                 <if test="status != null and status != ''">
                     AND p.CV_STATUS =#{status}
                 </if>
-                <if test="positionIdList != null">
-                    AND j.POSITION_ID IN
-                    <foreach collection="positionIdList" item="id" separator="," open="(" close=")">
+                <if test="jobIdList != null">
+                    AND j.JOB_ID IN
+                    <foreach collection="jobIdList" item="id" separator="," open="(" close=")">
                         #{id}
                     </foreach>
                 </if>
@@ -603,9 +603,9 @@
         <if test="status != null and status != ''">
             AND p.CV_STATUS =#{status}
         </if>
-        <if test="positionIdList != null">
-            AND j.POSITION_ID IN
-            <foreach collection="positionIdList" item="id" separator="," open="(" close=")">
+        <if test="jobIdList != null">
+            AND j.JOB_ID IN
+            <foreach collection="jobIdList" item="id" separator="," open="(" close=")">
                   #{id}
             </foreach>
         </if>