Merge remote-tracking branch 'origin/develop' into develop

# Conflicts: # src/main/webapp/WEB-INF/classes/hls/HLS536/hls_journal_import_header_wfl.lwm

Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # src/main/webapp/WEB-INF/classes/hls/HLS536/hls_journal_import_header_wfl.lwm
86393199 · TIANZHI.HU · 6df2e7db · a09dd5f4 · 86393199
Commit 86393199 authored Mar 02, 2023 by TIANZHI.HU
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

hls_journal_import_reverse_wfl.lwm ...INF/classes/hls/HLS536/hls_journal_import_reverse_wfl.lwm +1 -1

No files found.
--- a/src/main/webapp/WEB-INF/classes/hls/HLS536/hls_journal_import_reverse_wfl.lwm
+++ b/src/main/webapp/WEB-INF/classes/hls/HLS536/hls_journal_import_reverse_wfl.lwm
@@ -46,7 +46,7 @@
                     t1.journal_type,
                     (select t.post_gl_status
                        from hls_journal_header t
-                       where t.journal_num = t1.journal_num) post_gl_status
+                       where t.journal_header_imp_id = t1.journal_header_id) post_gl_status
                FROM hls_journal_header_imp t1
                 #WHERE_CLAUSE#
                 order by t1.journal_header_id desc