Merge remote-tracking branch 'origin/main'

ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserWorkExperiencesController.java

@@ -1,7 +1,5 @@
 package com.ruoyi.cms.controller.app;
 
-import com.ruoyi.cms.domain.JobApply;
-import com.ruoyi.cms.service.impl.JobApplyServiceImpl;
 import com.ruoyi.common.core.domain.entity.UserWorkExperiences;
 import com.ruoyi.cms.service.UserWorkExperiencesService;
 import com.ruoyi.common.core.controller.BaseController;
@@ -32,9 +30,6 @@ public class AppUserWorkExperiencesController extends BaseController {
     @Autowired
     private UserWorkExperiencesService userWorkExperiencesService;
 
-    @Autowired
-    JobApplyServiceImpl jobApplyService;
-
     /**
      * 列表
      */
@@ -44,14 +39,6 @@ public class AppUserWorkExperiencesController extends BaseController {
         if(userWorkExperiences.getUserId()==null){
             userWorkExperiences.setUserId(SiteSecurityUtils.getUserId());
         }
-        //已读简历
-        if (userWorkExperiences.getJobId() != null) {
-            JobApply jobApply = jobApplyService.selectByJobIdAndUserId(userWorkExperiences.getJobId(), userWorkExperiences.getUserId());
-            if (jobApply != null) {
-                jobApply.setIsView("1");
-                jobApplyService.updateJobApply(jobApply);
-            }
-        }
         startPage();
         List<UserWorkExperiences> list=userWorkExperiencesService.getWorkExperiencesList(userWorkExperiences);
         return getDataTable(list);

ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java

@@ -1,6 +1,8 @@
 package com.ruoyi.cms.controller.cms;
 
+import com.ruoyi.cms.domain.JobApply;
 import com.ruoyi.cms.service.IAppUserService;
+import com.ruoyi.cms.service.impl.JobApplyServiceImpl;
 import com.ruoyi.cms.util.RoleUtils;
 import com.ruoyi.common.core.domain.entity.AppUser;
 import com.ruoyi.common.core.domain.entity.UserWorkExperiences;
@@ -33,9 +35,13 @@ public class UserWorkExperiencesController extends BaseController {
 
     @Autowired
     private UserWorkExperiencesService userWorkExperiencesService;
+
     @Autowired
     private IAppUserService appUserService;
 
+    @Autowired
+    private JobApplyServiceImpl jobApplyService;
+
     /**
      * 列表
      */
@@ -43,6 +49,14 @@ public class UserWorkExperiencesController extends BaseController {
     @PreAuthorize("@ss.hasPermi('cms:userworkexperiences:list')")
     @GetMapping("/list")
     public TableDataInfo list(UserWorkExperiences userWorkExperiences){
+        //已读简历
+        if (userWorkExperiences.getJobId() != null) {
+            JobApply jobApply = jobApplyService.selectByJobIdAndUserId(userWorkExperiences.getJobId(), userWorkExperiences.getUserId());
+            if (jobApply != null) {
+                jobApply.setIsView("1");
+                jobApplyService.updateJobApply(jobApply);
+            }
+        }
         startPage();
         List<UserWorkExperiences> list=userWorkExperiencesService.getWorkExperiencesList(userWorkExperiences);
         return getDataTable(list);

ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyJobLive.java

@@ -49,7 +49,6 @@ public class CompanyJobLive extends BaseEntity
     @ApiModelProperty("结束时间")
     private String endTime;
 
-
     @ApiModelProperty("公司ID")
     private Long companyId;
 

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyJobLiveServiceImpl.java

@@ -64,6 +64,6 @@ public class CompanyJobLiveServiceImpl implements ICompanyJobLiveService {
         LoginUser logUser = SecurityUtils.getLoginUser();
         SysUser sysUser = logUser.getUser();
         Company company = companyService.queryCodeCompany(sysUser.getIdCard());
-        return company.getCompanyId();
+        return company != null ? company.getCompanyId() : null;
     }
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java

@@ -153,7 +153,11 @@ public class JobApplyServiceImpl extends ServiceImpl<JobApplyMapper,JobApply> im
 
     @Override
     public List<Job> selectJobApplyListJob(JobApply jobApply) {
-        return jobApplyMapper.selectJobApplyListJob(jobApply);
+        List<Job> jobList = jobApplyMapper.selectJobApplyListJob(jobApply);
+        jobList.forEach(job -> {
+            job.setIsApply(1);
+        });
+        return jobList;
     }
 
     @Override