diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml index 1ec3a68e..d02fce6b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml @@ -56,19 +56,20 @@ select * from ( SELECT standard.id, standard.standard_number, standard.standard_name, standard.implementation_date, standard.standard_state, standard.source, standard.create_time, - standard.new_product_impl_date, standard.new_auth_impl_date, standard.create_by, standard.responsible_user + standard.new_product_impl_date, standard.new_auth_impl_date, standard.create_by, standard.responsible_user, + standard.release_date , split.id AS split_info_id FROM - (SELECT id, standard_number, standard_name, implementation_date, standard_state, '1' AS source, create_time, + (SELECT id, standard_number, standard_name, implementation_date, null as release_date, standard_state, '1' AS source, create_time, new_product_impl_date, new_auth_impl_date, create_by, responsible_user FROM laws_domestic_standard WHERE del_flag = 0 UNION ALL - SELECT id, standard_number, standard_name, release_date, standard_state as es_standard_state, '3' AS source, create_time, + SELECT id, standard_number, standard_name, null as implementation_date, release_date, standard_state as es_standard_state, '3' AS source, create_time, null as new_product_impl_date, null as new_auth_impl_date, create_by, null as responsible_user FROM laws_enterprise_standard WHERE del_flag = 0) standard