Merge branch 'dev/xmy' of http://8.152.4.3:3000/yp/sj-backend into dev/xmy

ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/mapper/MainExamApplyMapper.java

@@ -1,5 +1,6 @@
 package org.dromara.main.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
@@ -19,6 +20,7 @@ public interface MainExamApplyMapper extends BaseMapperPlus<MainExamApply, MainE
     @Update("UPDATE main_exam_apply SET del_flag = '0', apply_source = '3', apply_status = '0', schedule_start_time = NOW(), deadline_time = NULL, max_attempt_count = 1, finished_time = NULL, final_result = NULL, update_time = NOW() WHERE id = #{id}")
     int restoreDeletedApply(@Param("id") Long id);
 
+    @InterceptorIgnore(tenantLine = "true")
     @Select("""
         SELECT
             a.id,
@@ -45,7 +47,7 @@ public interface MainExamApplyMapper extends BaseMapperPlus<MainExamApply, MainE
             a.finished_time AS finishedTime,
             a.create_time AS createTime
         FROM main_exam_apply a
-        LEFT JOIN main_exam_evaluation e ON a.evaluation_id = e.id AND IFNULL(e.del_flag, '0') = '0'
+        LEFT JOIN main_exam_evaluation e ON a.evaluation_id = e.id
         LEFT JOIN main_position p ON e.position_id = p.id
         WHERE IFNULL(a.del_flag, '0') = '0'
           AND a.student_id = #{studentId}

ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/mapper/MainPostCandidateReviewMapper.java

@@ -1,5 +1,6 @@
 package org.dromara.main.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -15,6 +16,7 @@ public interface MainPostCandidateReviewMapper extends BaseMapperPlus<MainPostCa
     /**
      * 查询学员任职记录列表（关联岗位表和租户表）
      */
+    @InterceptorIgnore(tenantLine = "true")
     @Select("""
         SELECT r.id,
                r.candidate_id,
@@ -30,7 +32,7 @@ public interface MainPostCandidateReviewMapper extends BaseMapperPlus<MainPostCa
                p.post_type AS postType
           FROM main_post_candidate_review r
           LEFT JOIN sys_tenant t ON t.tenant_id = r.tenant_id
-          LEFT JOIN main_position p ON p.id = r.post_id AND p.del_flag = '0'
+          LEFT JOIN main_position p ON p.id = r.post_id
          WHERE r.student_id = #{studentId}
            AND r.del_flag = '0'
          ORDER BY r.create_time DESC

ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/mapper/MainTrainingLearnRecordMapper.java

@@ -1,5 +1,6 @@
 package org.dromara.main.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -44,6 +45,7 @@ public interface MainTrainingLearnRecordMapper extends BaseMapperPlus<MainTraini
      * 查询学员全部培训记录（合并线上视频培训 + 线下培训报名）
      * 关联 main_training 表获取培训名称、类型、时间
      */
+    @InterceptorIgnore(tenantLine = "true")
     @Select("""
         SELECT r.id,
                r.training_id AS trainingId,
@@ -57,7 +59,7 @@ public interface MainTrainingLearnRecordMapper extends BaseMapperPlus<MainTraini
                NULL AS enrollStatus,
                NULL AS checkInTime
           FROM main_training_learn_record r
-          LEFT JOIN main_training t ON t.id = r.training_id AND t.del_flag = '0'
+          LEFT JOIN main_training t ON t.id = r.training_id
          WHERE r.student_id = #{studentId}
            AND r.del_flag = '0'
 
@@ -75,7 +77,7 @@ public interface MainTrainingLearnRecordMapper extends BaseMapperPlus<MainTraini
                e.enroll_status AS enrollStatus,
                e.check_in_time AS checkInTime
           FROM main_training_enrollment e
-          LEFT JOIN main_training t ON t.id = e.training_id AND t.del_flag = '0'
+          LEFT JOIN main_training t ON t.id = e.training_id
          WHERE e.student_id = #{studentId}
            AND e.del_flag = '0'