1、更改投递查询bug

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/person/AppAdminPersonCvController.java

@@ -44,7 +44,7 @@ public class AppAdminPersonCvController {
 
     @PreAuthenticated
     @GetMapping("/detail")
-    @Operation(summary = "根据userId获取人才在线简历详情")
+    @Operation(summary = "获取人才在线简历详情")
     public CommonResult<AppAdminPersonDetailRespVO> detail(
             @RequestParam("id") Long id,
             @RequestParam("userId") Long userId) {

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobCvRelServiceImpl.java

@@ -62,10 +62,12 @@ public class JobCvRelServiceImpl implements JobCvRelService {
         jobCvRelMapper.deleteById(id);
     }
 
-    private void validateJobCvRelExists(Long id) {
-        if (jobCvRelMapper.selectById(id) == null) {
+    private JobCvRelDO validateJobCvRelExists(Long id) {
+        JobCvRelDO jobCvRel = jobCvRelMapper.selectById(id);
+        if (null == jobCvRel) {
             throw exception(JOB_CV_REL_NOT_EXISTS);
         }
+        return jobCvRel;
     }
 
     @Override
@@ -116,7 +118,7 @@ public class JobCvRelServiceImpl implements JobCvRelService {
     @Override
     @DSTransactional
     public boolean look(Long id) {
-        JobCvRelDO jobCvRel = jobCvRelMapper.selectById(id);
+        JobCvRelDO jobCvRel = validateJobCvRelExists(id);
         if (JobCvRelStatusEnum.LOOK.getStatus().equals(jobCvRel.getStatus())) {
             return true;
         }
@@ -127,7 +129,7 @@ public class JobCvRelServiceImpl implements JobCvRelService {
     @Override
     @DSTransactional
     public boolean eliminate(Long id) {
-        JobCvRelDO jobCvRel = jobCvRelMapper.selectById(id);
+        JobCvRelDO jobCvRel = validateJobCvRelExists(id);
         jobCvRel.setStatus(JobCvRelStatusEnum.ELIMINATE.getStatus());
         return jobCvRelMapper.updateById(jobCvRel) == 1;
     }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobIntegrationServiceImpl.java

@@ -167,9 +167,10 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
         // 构建分页
         Pageable pageable = PageRequest.of(reqVO.getPageNo() - 1, reqVO.getPageSize());
 
-        if (null != reqVO.getAreaIds() && reqVO.getAreaIds().size() <= 1) {
-            // 不为空且只有一个区域id的情况
-            Set<Long> areaIds = areaService.getChildrenIds(reqVO.getAreaIds().get(0));
+        if (null != reqVO.getAreaIds()) {
+            // 取最后一个元素
+            Set<Long> areaIds = areaService.
+                    getChildrenIds(reqVO.getAreaIds().get(reqVO.getAreaIds().size() - 1));
             if (!areaIds.isEmpty()) {
                 List<Long> areaIdList = new ArrayList<>(areaIds);
                 // 包括自己
@@ -285,19 +286,22 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
         List<Long> userIdList = pageResult.getList()
                 .stream().map(AppAdminJobCvRelRespVO::getUserId).collect(Collectors.toList());
         reqVO.setUserId(userIdList);
+        // 基于用户id 查询用户相关信息
         PageResult<AppAdminPersonSimpleRespVO> personSimpleResult
                 = personInfoMapper.selectSimplePersonPage(reqVO);
 
         List<AppAdminJobCvRelRespVO> list = new ArrayList<>();
 
-        for (AppAdminPersonSimpleRespVO personSimple : personSimpleResult.getList()) {
-            AppAdminJobCvRelRespVO respVO = pageResult.getList().stream()
-                    .filter(jobCvRel -> jobCvRel.getUserId().equals(personSimple.getUserId()))
+        // 拼接对象
+        for (AppAdminJobCvRelRespVO cvRel : pageResult.getList()) {
+            AppAdminPersonSimpleRespVO respVO = personSimpleResult.getList().stream()
+                    .filter(personSimple -> personSimple.getUserId().equals(cvRel.getUserId()))
                     .findFirst().orElse(null);
+
             if (null != respVO) {
-                respVO.setPerson(personSimple);
+               cvRel.setPerson(respVO);
             }
-            list.add(respVO);
+            list.add(cvRel);
         }
         // 以二次查询的personSimpleResult 为准
         pageResult.setList(list);