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

9ffae4a8 · wuwenlong · aa13d816 · 4b0a886a · 9ffae4a8
Commit 9ffae4a8 authored Jun 13, 2024 by wuwenlong
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

HGSJ001.xml src/main/java/com/baosight/hggp/hg/sj/sql/HGSJ001.xml +1 -1

No files found.
--- a/src/main/java/com/baosight/hggp/hg/sj/sql/HGSJ001.xml
+++ b/src/main/java/com/baosight/hggp/hg/sj/sql/HGSJ001.xml
@@ -311,7 +311,7 @@
 		a.ORG_ENAME as "orgEname",
 		a.ORG_CNAME as "orgCname"
 		from ${platSchema}.txsog01 a
-		<isNotEmpty prepend="AND" property="userId">
+		<isNotEmpty property="userId">
 			left join ${platSchema}.txsog02 b on a.ORG_ID = b.ORG_ID
 		</isNotEmpty>
 		where 1=1