|
@@ -9,7 +9,7 @@
|
|
|
FROM centerdata_t_key_projects a
|
|
|
LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
|
|
|
WHERE 1=1 ${params.dataScope}
|
|
|
- <if test="park != null and park != ''">and park = #{park}</if>
|
|
|
+ <if test="park != null and park != ''">and a.park = #{park}</if>
|
|
|
GROUP BY a.territoriality
|
|
|
</select>
|
|
|
|
|
@@ -19,7 +19,9 @@
|
|
|
LEFT JOIN (
|
|
|
SELECT a.id,a.project_level FROM centerdata_t_forest_importarea a
|
|
|
LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
|
|
|
- where 1=1 ${params.dataScope}
|
|
|
+ where 1=1
|
|
|
+ <if test="projectType != null and projectType != ''">and a.project_type = #{projectType}</if>
|
|
|
+ ${params.dataScope}
|
|
|
) a ON b.dict_value = a.project_level
|
|
|
WHERE b.dict_type = 'centerdata_project_level'
|
|
|
GROUP BY b.dict_value
|