diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml index b45bd770..1e8ed57f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml @@ -195,15 +195,9 @@ from t_bom_new_ebom_parent a join (select material_no, max(current_version) current_version from t_bom_new_ebom_parent where status=4 - - AND created_by = #{userCode} - group by material_no) b on a.material_no=b.material_no and a.current_version=b.current_version where a.status=4 - - AND a.created_by = #{userCode} - @@ -273,7 +267,8 @@ and a.`status` < 4 ) b on a.material_no=b.material_no - set a.root_is=1 + set a.root_is=1, + a.user_root_is=1 where a.`status` < 4 and b.row_id is null and a.last_version_is=1 ; @@ -312,7 +307,8 @@ - update t_bom_new_ebom_parent set status=#{status} , convert_to_ebom_time=now(),edit_status=2,exception_status=1 + update t_bom_new_ebom_parent set status=#{status} , + convert_to_ebom_time=now(),release_time=now(),release_user_name=#{userName},edit_status=2,exception_status=1 where row_id in #{item}