|
@@ -157,6 +157,7 @@ FROM (
|
|
|
FROM centerdata_t_forest_watercrane a
|
|
|
LEFT JOIN ${database_system}.sys_dept d ON d.dept_id = a.dept_id
|
|
|
WHERE 1 = 1 ${params.dataScope}
|
|
|
+ AND del_flag = 0
|
|
|
GROUP BY a.dept_id
|
|
|
|
|
|
UNION ALL
|
|
@@ -165,6 +166,7 @@ FROM (
|
|
|
FROM centerdata_t_forest_waterintake a
|
|
|
LEFT JOIN ${database_system}.sys_dept d ON d.dept_id = a.dept_id
|
|
|
WHERE 1 = 1 ${params.dataScope}
|
|
|
+ AND del_flag = 0
|
|
|
GROUP BY a.dept_id
|
|
|
|
|
|
UNION ALL
|
|
@@ -173,6 +175,7 @@ FROM (
|
|
|
FROM centerdata_t_forest_firehydrant a
|
|
|
LEFT JOIN ${database_system}.sys_dept d ON d.dept_id = a.dept_id
|
|
|
WHERE 1 = 1 ${params.dataScope}
|
|
|
+ AND del_flag = 0
|
|
|
GROUP BY a.dept_id
|
|
|
) a GROUP BY a.ancestors,a.deptId
|
|
|
</select>
|