Merge remote-tracking branch 'origin/master'

src/main/resources/mapper/change/ChangeManagementMapper.xml

@@ -1095,7 +1095,7 @@
                   case when c.update_by is null then d.username else c.update_by end as updateBy
               from plm_request_header a
                        LEFT JOIN plm_request_node b ON a.SITE = b.SITE AND a.classification_no = b.classification_no AND a.workflow_id = b.workflow_id
-                       LEFT JOIN plm_process_form c ON b.SITE = b.SITE AND b.classification_no = c.classification_no AND b.workflow_id = c.workflow_id AND b.node_id = c.node_id and c.document_no = #{documentNo}
+                       LEFT JOIN plm_process_form c ON b.SITE = c.SITE AND b.classification_no = c.classification_no AND b.workflow_id = c.workflow_id AND b.node_id = c.node_id and c.document_no = #{documentNo}
                        left join sys_user as d on c.domain_control_account = d.domain_control_account
               WHERE a.site = #{site} AND a.menu_id = #{menuId} and c.create_date is not null
               group by a.site, a.classification_no, b.node_id, b.node_name, c.reject_flag, c.reject_node_id, c.node_conclusion, c.node_conclusion, c.update_by, c.create_date, CAST(c.update_date AS DATETIME2(0)), c.create_by, c.reject_opinion, c.update_date, d.username