Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/sqx/modules/intention/dao/IntentionDao.java

@@ -1,6 +1,8 @@
 package com.sqx.modules.intention.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sqx.modules.intention.entity.Intention;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -15,4 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IntentionDao extends BaseMapper<Intention> {
 
+    Page<Intention> getIntentionList(IPage<Intention> page);
+
 }

src/main/java/com/sqx/modules/intention/service/impl/IntentionServiceImpl.java

@@ -5,18 +5,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sqx.common.utils.Result;
-import com.sqx.modules.app.entity.UserEntity;
 import com.sqx.modules.app.service.UserService;
 import com.sqx.modules.common.service.CommonInfoService;
 import com.sqx.modules.intention.dao.IntentionDao;
 import com.sqx.modules.intention.entity.Intention;
 import com.sqx.modules.intention.service.IntentionService;
-import com.sqx.modules.resumes.entity.RuleClassify;
 import com.sqx.modules.resumes.service.RuleClassifyService;
-import com.sqx.modules.resumes.service.RulePostService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import weixin.popular.bean.datacube.article.Usershare;
 
 import java.time.LocalDateTime;
 import java.util.Collections;
@@ -50,14 +46,8 @@ public class IntentionServiceImpl extends ServiceImpl<IntentionDao, Intention> i
     }
     @Override
     public IPage<Intention> getIntentionList(Integer page, Integer limit, Intention intention) {
-        Page<Intention> pages;
-        if (page != null && limit != null) {
-            pages = new Page<>(page, limit);
-        } else {
-            pages = new Page<>();
-            pages.setSize(-1);
-        }
-        return baseMapper.selectPage(pages, new QueryWrapper<>(intention).orderByDesc("create_time"));
+        IPage<Intention> pages=new Page<>(page,limit);
+        return baseMapper.getIntentionList(pages);
     }
 
     @Override

src/main/java/com/sqx/modules/resumes/controller/ResumesController.java

@@ -113,7 +113,7 @@ public class ResumesController {
     @Login
     @GetMapping("/selectResumesByUserId")
     @ApiOperation("查询自己的个人简历")
-    public Result selectResumesByUserId(@RequestAttribute("userId") Long userId){
+    public Result selectResumesByUserId(Long userId){
         Resumes resumes = resumesService.selectResumesByUserId(userId);
         if (resumes!=null){
             return Result.success().put("data", resumesService.selectResumesByResumesId(resumes.getResumesId(),userId,null));

src/main/resources/mapper/intention/IntentionDao.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sqx.modules.intention.dao.IntentionDao">
+
+    <select id="getIntentionList" resultType="com.sqx.modules.intention.entity.Intention">
+        select a.intention_id, a.user_id, b.user_name, a.rule_classify_id, a.rule_classify_name,
+        a.citys, a.salary_range, a.industry, a.create_time, a.post_type, a.industry_id, a.industry_one_id,
+        a.classify_one_id, a.classify_two_id, a.is_default, a.min_salary, a.max_salary
+        from intention a
+        left join tb_user b on a.user_id = b.user_id
+        order by a.create_time desc
+    </select>
+
+</mapper>