|
|
@@ -231,11 +231,11 @@
|
|
|
WHERE delete_mark = 0 AND room_id = t1.id
|
|
|
AND student_user_id IS NOT NULL
|
|
|
) AS into_count,(
|
|
|
- SELECT GROUP_CONCAT(c3.name) FROM room_bed c1
|
|
|
+ SELECT GROUP_CONCAT(DISTINCT(c3.name)) FROM room_bed c1
|
|
|
LEFT JOIN base_student_school_roll c2 ON c1.student_user_id = c2.user_id
|
|
|
LEFT JOIN base_class c3 ON c2.class_id = c3.id
|
|
|
WHERE c1.delete_mark = 0 AND c1.room_id = t1.id
|
|
|
- AND c1.student_user_id IS NOT NULL
|
|
|
+ AND c1.student_user_id IS NOT NULL group by c3.id
|
|
|
) AS into_class FROM room t1
|
|
|
LEFT JOIN base_office_build t2 ON t1.office_build_id = t2.id
|
|
|
LEFT JOIN xjr_dictionary_detail t3 ON t1.check_in_status = t3.code AND t3.item_id = 1739843696019435521
|