Merge branch 'main' of http://124.243.245.42:3000/zkr/shz-backend into main

 Conflicts:

	ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml

ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/CandidateVO.java

@@ -12,7 +12,7 @@ public class CandidateVO extends AppUser {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date applyDate;
     private Integer matchingDegree;
-    private String applyId;
+    private Long applyId;
     private String hire;
     @Excel(name = "公司名称", sort = 0)
     private String companyName;

ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml

@@ -385,6 +385,7 @@
             FROM (
             SELECT
                 r.*,
+                ja.id AS apply_id,
                 CASE
                 WHEN (CAST(p.job_category AS TEXT) = ANY(string_to_array(r.job_title_id, ',')) OR p.job_category IS NULL)
                     AND ((CAST(r.salary_min AS INTEGER) <= p.max_salary AND CAST(r.salary_max AS INTEGER) >= p.min_salary) OR p.max_salary IS NULL)
@@ -404,7 +405,8 @@
                 END AS match_level
             FROM shz.job p
             JOIN shz.app_user r ON r.del_flag = '0'
-            WHERE r.is_company_user = '1' and p.job_id = #{jobId}
+            LEFT JOIN shz.job_apply ja ON ja.user_id = r.user_id AND ja.job_id = p.job_id AND ja.del_flag = '0'
+            WHERE p.job_id = #{jobId}
             ) c
         ) t
         WHERE best_rn = 1