diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java index e6b68277..62e833b9 100644 --- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java +++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java @@ -1726,7 +1726,10 @@ public class ChangeManagementServiceImpl extends ServiceImpl @@ -1402,8 +1407,8 @@ a.change_no, a.applicant_id, dbo.get_userDisPlay(a.applicant_id) as applicantName, - d.department_no as applicationDepartmentId, - dbo.get_department_name(a.site, d.department_no) as applicationDepartmentName, + u.department_no as applicationDepartmentId, + dbo.get_department_name(a.site, u.department_no) as applicationDepartmentName, a.apply_date, a.ecn_type, a.change_impact, @@ -1432,11 +1437,16 @@ a.cqc_operator_id, dbo.get_userDisPlay(a.cqc_operator_id) as cqcOperatorName, a.fai_operator_id, - dbo.get_userDisPlay(a.fai_operator_id) as faiOperatorName + dbo.get_userDisPlay(a.fai_operator_id) as faiOperatorName, + d.node_id, + d.node_name, + d.create_by as createBy2 FROM plm_change_request as a - LEFT JOIN sys_user as d on a.site = d.site and a.applicant_id = d.username + LEFT JOIN sys_user as u on a.site = u.site and a.applicant_id = u.username LEFT JOIN plm_change_request_detail as b on a.site = b.site and a.change_no = b.change_no LEFT JOIN plm_project_part as c on b.site = c.site and b.part_no = c.final_part_no + left join plm_request_header as prh on a.site = prh.site and prh.menu_id = #{menuId} + left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and prh.workflow_id = d.workflow_id and a.step_id = d.step_id WHERE a.site = #{site} and c.project_id = #{projectId} and c.final_part_no = #{finalPartNo}