|
|
@@ -198,8 +198,7 @@
|
|
|
<select id="selectCoreSafecheckPlanPage" resultMap="CoreSafecheckPlanResult">
|
|
|
SELECT
|
|
|
GROUP_CONCAT(DISTINCT role_name) as role_names,
|
|
|
- # GROUP_CONCAT( tem.check_org_name) as check_org,
|
|
|
- GROUP_CONCAT( tem.exec_org_name) as exec_org,
|
|
|
+<!-- GROUP_CONCAT( tem.exec_org_name) as exec_org,-->
|
|
|
GROUP_CONCAT(DISTINCT tem.dict_label) as type_names,
|
|
|
tem.*
|
|
|
FROM
|
|
|
@@ -237,10 +236,10 @@
|
|
|
o2.short_name AS plan_of_org_name,
|
|
|
r.role_name,
|
|
|
r.id AS role_id,
|
|
|
- o3.id AS check_org_id,
|
|
|
- o3.short_name AS check_org_name,
|
|
|
- o4.id AS exec_org_id,
|
|
|
- o4.short_name AS exec_org_name,
|
|
|
+<!-- o3.id AS check_org_id,-->
|
|
|
+<!-- o3.short_name AS check_org_name,-->
|
|
|
+<!-- o4.id AS exec_org_id,-->
|
|
|
+<!-- o4.short_name AS exec_org_name,-->
|
|
|
typ.type_id,
|
|
|
typ.plan_id as type_plan_id,
|
|
|
dic.dict_label
|
|
|
@@ -251,10 +250,10 @@
|
|
|
LEFT JOIN sys_org o2 ON c.plan_of_org_id = o2.id
|
|
|
LEFT JOIN core_safecheck_plan_to_role pr ON c.id = pr.plan_id
|
|
|
LEFT JOIN sys_role r ON r.id = pr.role_id
|
|
|
- LEFT JOIN core_safecheck_plan_to_check_org co ON co.plan_id = c.id
|
|
|
- LEFT JOIN sys_org o3 ON o3.id = co.org_id
|
|
|
- LEFT JOIN core_safecheck_plan_to_exec_org eo ON eo.plan_id = c.id
|
|
|
- LEFT JOIN sys_org o4 ON o4.id = eo.org_id
|
|
|
+<!-- LEFT JOIN core_safecheck_plan_to_check_org co ON co.plan_id = c.id-->
|
|
|
+<!-- LEFT JOIN sys_org o3 ON o3.id = co.org_id-->
|
|
|
+<!-- LEFT JOIN core_safecheck_plan_to_exec_org eo ON eo.plan_id = c.id-->
|
|
|
+<!-- LEFT JOIN sys_org o4 ON o4.id = eo.org_id-->
|
|
|
LEFT JOIN sys_user u1 ON u1.id = c.modified_by
|
|
|
LEFT JOIN core_safecheck_plan_to_check_org_type typ ON c.id=typ.plan_id
|
|
|
LEFT JOIN sys_dict_data dic ON dic.dict_value = typ.type_id
|