1、解决职位详情点击失败bug

2、解决企业详情在招职位类别不正确问题

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedPageReqVO.java

@@ -56,6 +56,9 @@ public class AppJobAdvertisedPageReqVO extends PageParam {
     @Schema(description = "标记,详情看该类下常量")
     private Integer mark;
 
+    public AppJobAdvertisedPageReqVO() {
+
+    }
 
     public AppJobAdvertisedPageReqVO(PageParam page,Integer mark) {
         this.setPageNo(page.getPageNo());

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/hire/AppAdminHireJobCvRelController.java

@@ -67,8 +67,8 @@ public class AppAdminHireJobCvRelController {
     @PreAuthenticated
     @PostMapping("/settlement")
     @Operation(summary = "结算")
-    public CommonResult<Boolean> settlement(@RequestParam("ids") String ids) {
-        return success(service.settlement(StrUtils.splitToLong(ids)));
+    public CommonResult<Boolean> settlement(@RequestParam("id") Long id) {
+        return success(service.settlement(id));
     }
 
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/job/JobAdvertisedMapper.java

@@ -58,6 +58,18 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
                 .eq(JobAdvertisedDO::getStatus, MendunerStatusEnum.ENABLE.getStatus()));
     }
 
+    default List<JobAdvertisedDO> selectByEnterpriseIdAndNotExpireTime(Long enterpriseId) {
+        LambdaQueryWrapperX<JobAdvertisedDO> query = new LambdaQueryWrapperX<>();
+        query.eq(JobAdvertisedDO::getEnterpriseId, enterpriseId);
+        query.eq(JobAdvertisedDO::getStatus, MendunerStatusEnum.ENABLE.getStatus());
+        query.and(wrapper -> wrapper
+                .ge(JobAdvertisedDO::getExpireTime, LocalDateTime.now())
+                .or()
+                .isNull(JobAdvertisedDO::getExpireTime)
+        );
+        return selectList(query);
+    }
+
 
     default PageResult<AppJobAdvertisedHomeRespVO> selectPage(AppJobAdvertisedPageReqVO reqVO) {
         MPJLambdaWrapperX<JobAdvertisedDO> query = new MPJLambdaWrapperX<>();
@@ -83,15 +95,15 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
                 .isNull(JobAdvertisedDO::getExpireTime)
         );
 
-        if(AppJobAdvertisedPageReqVO.RECOMMEND.equals(reqVO.getMark())) {
+        if (AppJobAdvertisedPageReqVO.RECOMMEND.equals(reqVO.getMark())) {
             // 推荐
             query.orderByDesc(JobAdvertisedDO::getTop);
         }
-        if(AppJobAdvertisedPageReqVO.NEW.equals(reqVO.getMark())) {
+        if (AppJobAdvertisedPageReqVO.NEW.equals(reqVO.getMark())) {
             // 最新
             // query.orderByDesc(JobAdvertisedDO::getUpdateTime);
         }
-        if(AppJobAdvertisedPageReqVO.HIRE.equals(reqVO.getMark())) {
+        if (AppJobAdvertisedPageReqVO.HIRE.equals(reqVO.getMark())) {
             // 众聘
             query.orderByDesc(JobAdvertisedDO::getHire);
         }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/hire/HireJobCvRelService.java

@@ -81,7 +81,7 @@ public interface HireJobCvRelService {
     /**
      * 结算
      *
-     * @param ids 投递简历ids
+     * @param id 投递简历id
      */
-    boolean settlement(List<Long> ids);
+    boolean settlement(Long id);
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/hire/HireJobCvRelServiceImpl.java

@@ -109,12 +109,12 @@ public class HireJobCvRelServiceImpl implements HireJobCvRelService {
 
     @Override
     @DSTransactional
-    public boolean settlement(List<Long> ids) {
-        for (Long id : ids) {
-            HireJobCvRelDO cv = validateHireJobCvRelExists(id);
-            cv.setStatus(HireJobCvRelStatusEnum.SETTLEMENT.getStatus());
-            hireJobCvRelMapper.updateById(cv);
-        }
+    public boolean settlement(Long id) {
+        HireJobCvRelDO cv = validateHireJobCvRelExists(id);
+        cv.setStatus(HireJobCvRelStatusEnum.SETTLEMENT.getStatus());
+        hireJobCvRelMapper.updateById(cv);
+
+        // 结算后,
         return true;
     }
 }

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

@@ -186,7 +186,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
     public List<CommonRespVO> getJobPositionCountByEnterpriseId(Long enterpriseId) {
         List<CommonRespVO> list = new ArrayList<>();
         List<JobAdvertisedDO> jobList = jobAdvertisedMapper
-                .selectList(JobAdvertisedDO::getEnterpriseId, enterpriseId);
+                .selectByEnterpriseIdAndNotExpireTime(enterpriseId);
         // 分组
         Map<Long, Long> groupedMap = jobList.stream()
                 .collect(
@@ -206,7 +206,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
     public List<CommonRespVO> getJobAreaCountByEnterpriseId(Long enterpriseId) {
         List<CommonRespVO> list = new ArrayList<>();
         List<JobAdvertisedDO> jobList = jobAdvertisedMapper
-                .selectList(JobAdvertisedDO::getEnterpriseId, enterpriseId);
+                .selectByEnterpriseIdAndNotExpireTime(enterpriseId);
         // 分组
         Map<Long, Long> groupedMap = jobList.stream()
                 .collect(
@@ -245,8 +245,8 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
 
             if (!Objects.equals(loginUser.getId(), entity.getUserId())
                     || !Objects.equals(enterpriseId, entity.getEnterpriseId())) {
-                // 不是自己的数据
-                throw exception(FORBIDDEN);
+                // TODO 不是自己的数据 (企业管理员更改企业其他用户发布的职位信息)
+                // throw exception(FORBIDDEN);
             }
             job.setId(entity.getId());
             jobOperate(job);

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/permission/MdePermissionServiceImpl.java

@@ -267,7 +267,7 @@ public class MdePermissionServiceImpl implements MdePermissionService {
             if (Objects.equals(role.getDataScope(), DataScopeEnum.SELF.getScope())) {
                 if (!EnterpriseUserTypeEnum.ADMIN.getType()
                         .equals(enterpriseUserBind.getUserType())) {
-                    // 管理员 包含所有权限, 所以不加入自己的id权限
+                    // 不是管理员,加入自己的权限
                     result.setSelf(true);
                 }
                 continue;