Merge remote-tracking branch 'origin/master'

common/src/main/resources/mapper/job/Recruitment.xml

@@ -281,7 +281,7 @@
 	<!--招聘方职位管理-->
 	<select id="loadForRecruiter" parameterType="hashMap" resultType="Map">
 		<![CDATA[
-            SELECT * FROM (
+
 			SELECT
 			    jr.del_flag,
 			    jr.create_by,
@@ -301,23 +301,22 @@
 			left join sys_data_dictionary workyeard on jr.work_year=workyeard.id_ and workyeard.del_flag=0
 			left join sys_data_dictionary educationd on jr.education_=educationd.id_ and educationd.del_flag=0
 
-			) TAB
 		]]>
 		<where>
 			<if test="1==1">
-				and del_flag=0
+				and jr.del_flag=0
 			</if>
 			<if test="searchParams.recruiter != null"> <!--按创建人(招聘人)过滤-->
-				and create_by=#{searchParams.recruiter}
+				and jr.create_by=#{searchParams.recruiter}
 			</if>
 			<if test='searchParams.status =="publish"'> <!--按招聘状态过滤publish:已发布且审核完;approve:审核中;close:关闭下架-->
-				and status='1' and approveStatus='3'  <!--sys_data_dictionary where parent_id='163b92e3-9847-4370-a31e-6d62bed279e8'  -->
+				and jr.status_='1' and jr.approve_status='3'  <!--sys_data_dictionary where parent_id='163b92e3-9847-4370-a31e-6d62bed279e8'  -->
 			</if>
 			<if test='searchParams.status =="approve"'>
-				and status='1' and approveStatus='2'
+				and jr.status_='1' and jr.approve_status='2'
 			</if>
 			<if test='searchParams.status =="close"'>
-				and status='0'
+				and jr.status_='0'
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

common/src/main/resources/mapper/job/RecruitmentCollection.xml

@@ -215,7 +215,7 @@
 	<!--用于移动端接口：招聘方【招聘主页】-->
 	<select id="pagedLoadAllResumes" parameterType="hashMap" resultType="Map">
 		<![CDATA[
-			select  * from (select
+			select DISTINCT * from (select
 				ju.real_name  realName,
 				ju.head_image_url headImage,
 				ju.address_ address,

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/RecruiterApiController.java

@@ -72,7 +72,10 @@ public class RecruiterApiController {
 
     @PostMapping("getAboutMe")
     @ApiOperation(value = "招聘方['我的'主页]")
-    public MessageResult<Map<String,Object>>  getAboutMe(@RequestAttribute String subject){
+    public MessageResult<Map<String,Object>>  getAboutMe(
+            String token,
+            @RequestAttribute String subject
+    ){
         try{
             //包含两部分信息：个人信息，统计信息
             Assert.state(StringUtils.isNoneEmpty(subject),"缺少用户参数");
@@ -99,10 +102,12 @@ public class RecruiterApiController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "status", value = "招聘信息状态(publish:招聘中；approve：审核中；close：已下架)", required = true, paramType = "form")
     })
-    public MessageResultSimple loadOwnRecruitments(@RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-                                                @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-                                                @RequestParam(value="status",defaultValue="publish") String status,
-                                                @RequestAttribute String subject
+    public MessageResultSimple loadOwnRecruitments(
+            String token,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestParam(value="status",defaultValue="publish") String status,
+            @RequestAttribute String subject
     ) {
 
         try{
@@ -123,7 +128,9 @@ public class RecruiterApiController {
             @ApiImplicitParam(name = "recruitmentId", value = "招聘记录ID", required = true, paramType = "form"),
             @ApiImplicitParam(name = "publishTag", value = "上下架操作[1:上架，0:下架]", required = true, paramType = "form")
     })
-    public MessageResultSimple publishRecruitment(@RequestParam(value="recruitmentId",required = true) String recruitmentId,
+    public MessageResultSimple publishRecruitment(
+            String token,
+            @RequestParam(value="recruitmentId",required = true) String recruitmentId,
     		@RequestParam(value="publishTag",required = true) String publishTag,
     		@RequestAttribute String subject
     		){
@@ -150,15 +157,17 @@ public class RecruiterApiController {
             @ApiImplicitParam(name = "dreamMoney", value = "期望月薪编码值", required = false, paramType = "form"),
             @ApiImplicitParam(name = "jobStatus", value = "工作状态编码值", required = false, paramType = "form")
     })
-    public MessageResultSimple loadCollectResumes(@RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-                                                @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-                                                @RequestParam(value="positionName",required = false) String positionName,
-                                                @RequestParam(value="positionId",required = false) String positionId,
-                                                @RequestParam(value="education",required = false) String education,
-                                                @RequestParam(value="workExp",required = false) String workExp,
-                                                @RequestParam(value="dreamMoney",required = false) String dreamMoney,
-                                                @RequestParam(value="jobStatus",required = false) String jobStatus,
-                                                @RequestAttribute String subject
+    public MessageResultSimple loadCollectResumes(
+            String token,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestParam(value="positionName",required = false) String positionName,
+            @RequestParam(value="positionId",required = false) String positionId,
+            @RequestParam(value="education",required = false) String education,
+            @RequestParam(value="workExp",required = false) String workExp,
+            @RequestParam(value="dreamMoney",required = false) String dreamMoney,
+            @RequestParam(value="jobStatus",required = false) String jobStatus,
+            @RequestAttribute String subject
     ) {
 
         try{
@@ -180,7 +189,11 @@ public class RecruiterApiController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "resumeId", value = "简历记录主键", required = true, paramType = "form")
     })
-    public MessageResultSimple cancelCollectResume(@RequestParam(value="resumeId",required = true) String resumeId, @RequestAttribute String subject) {
+    public MessageResultSimple cancelCollectResume(
+            String token,
+            @RequestParam(value="resumeId",required = true) String resumeId,
+            @RequestAttribute String subject
+    ) {
     	try{
     		Assert.state(StringUtils.isNoneEmpty(subject),"缺少登录信息");
     		recruitmentCollectionService.updateCancelCollect(resumeId,subject);
@@ -205,15 +218,17 @@ public class RecruiterApiController {
             @ApiImplicitParam(name = "jobStatus", value = "工作状态编码值", required = false, paramType = "form"),
             @ApiImplicitParam(name = "orderType", value = "排序类别[new:最新，hot:最热]", required = false, paramType = "form")
     })
-    public MessageResultSimple loadAllResumes(@RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-                                                 @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-                                                 @RequestParam(value="orderType",defaultValue="new") String orderType,
-                                                 @RequestParam(value="positionName",required = false) String positionName,
-                                                 @RequestParam(value="positionId",required = false) String positionId,
-                                                 @RequestParam(value="education",required = false) String education,
-                                                 @RequestParam(value="workExp",required = false) String workExp,
-                                                 @RequestParam(value="dreamMoney",required = false) String dreamMoney,
-                                                 @RequestParam(value="jobStatus",required = false) String jobStatus
+    public MessageResultSimple loadAllResumes(
+            String token,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestParam(value="orderType",defaultValue="new") String orderType,
+            @RequestParam(value="positionName",required = false) String positionName,
+            @RequestParam(value="positionId",required = false) String positionId,
+            @RequestParam(value="education",required = false) String education,
+            @RequestParam(value="workExp",required = false) String workExp,
+            @RequestParam(value="dreamMoney",required = false) String dreamMoney,
+            @RequestParam(value="jobStatus",required = false) String jobStatus
     ) {
 
         try{