dzx пре 1 година
родитељ
комит
2ac8cc3e19
1 измењених фајлова са 6 додато и 6 уклоњено
  1. 6 6
      src/main/resources/mapper/student/StudentHonorsMapper.xml

+ 6 - 6
src/main/resources/mapper/student/StudentHonorsMapper.xml

@@ -8,9 +8,9 @@
         SELECT t1.id,t1.sort_code,t2.name AS student_name,t1.student_id,t3.name AS honors_level,t4.name AS honors_type,
         t5.name AS honors_grade,t1.name, t1.award_date,t1.status,t1.file_id FROM student_honors t1
         LEFT JOIN xjr_user t2 ON t1.student_user_id = t2.id
-        LEFT JOIN xjr_dictionary_detail t3 ON t1.honors_level = t3.code AND t3.item_id = 1731576278748352514
-        LEFT JOIN xjr_dictionary_detail t4 ON t1.honors_type = t4.code AND t4.item_id = 1731577666295418881
-        LEFT JOIN xjr_dictionary_detail t5 ON t1.honors_grade = t5.code AND t5.item_id = 1731577201793028098
+        LEFT JOIN xjr_dictionary_detail t3 ON t1.honors_level = t3.code AND t3.item_id = 1731576278748352514 AND t3.delete_mark = 0
+        LEFT JOIN xjr_dictionary_detail t4 ON t1.honors_type = t4.code AND t4.item_id = 1731577666295418881 AND t4.delete_mark = 0
+        LEFT JOIN xjr_dictionary_detail t5 ON t1.honors_grade = t5.code AND t5.item_id = 1731577201793028098 AND t5.delete_mark = 0
         WHERE t1.delete_mark = 0
         <if test="dto.classIdList != null">
             and t1.class_id in
@@ -90,9 +90,9 @@
                  LEFT JOIN base_class t5 ON t1.class_id = t5.id
                  LEFT JOIN base_major_set t6 ON t3.major_set_id = t6.id
                  LEFT JOIN xjr_user t7 ON t1.applicant_user_id = t7.id
-                 LEFT JOIN xjr_dictionary_detail t8 ON t1.honors_level = t8.code AND t8.item_id = 1731576278748352514
-                 LEFT JOIN xjr_dictionary_detail t9 ON t1.honors_type = t9.code AND t9.item_id = 1731577666295418881
-                 LEFT JOIN xjr_dictionary_detail t10 ON t1.honors_grade = t10.code AND t10.item_id = 1731577201793028098
+                 LEFT JOIN xjr_dictionary_detail t8 ON t1.honors_level = t8.code AND t8.item_id = 1731576278748352514 AND t8.delete_mark = 0
+                 LEFT JOIN xjr_dictionary_detail t9 ON t1.honors_type = t9.code AND t9.item_id = 1731577666295418881 AND t9.delete_mark = 0
+                 LEFT JOIN xjr_dictionary_detail t10 ON t1.honors_grade = t10.code AND t10.item_id = 1731577201793028098 AND t10.delete_mark = 0
                  LEFT JOIN base_major_set t11 ON t1.major_set_id = t11.id
         WHERE t1.id = #{id}
           and t1.delete_mark = 0