|
|
@@ -1231,7 +1231,7 @@
|
|
|
select t.id,
|
|
|
t.name,
|
|
|
cf.classified_name levelName,
|
|
|
- (SELECT laf.name FROM lab_build_floor laf INNER JOIN `lab_build_floor_layout` lbfl ON laf.id=lbfl.floor_id WHERE lbfl.sub_id=t.id AND laf.type=2) as floorName,
|
|
|
+ IFNULL((SELECT laf.name FROM lab_build_floor laf INNER JOIN `lab_build_floor_layout` lbfl ON laf.id=lbfl.floor_id WHERE lbfl.sub_id=t.id AND laf.type=2),(SELECT d.dept_name FROM sys_dept d WHERE t.build_id = d.dept_id)) AS floorName,
|
|
|
t.room,
|
|
|
cf.classified_color filedColor,
|
|
|
(SELECT ct.type_name FROM lab_safe_classtype ct WHERE ct.id = t.`type_id`) typeName,
|
