Merge branch 'dev-sx' of http://git.pseer.com/platform/hp-smart into dev

a60a9b84 · 宋祥 · ddd1def1 · dd19e305 · a60a9b84
Commit a60a9b84 authored Apr 24, 2024 by 宋祥
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletions

HPXSOrg.xml src/main/java/com/baosight/hpjx/hp/xs/sql/HPXSOrg.xml +3 -1

No files found.
--- a/src/main/java/com/baosight/hpjx/hp/xs/sql/HPXSOrg.xml
+++ b/src/main/java/com/baosight/hpjx/hp/xs/sql/HPXSOrg.xml
@@ -4,7 +4,9 @@
    <sql id="condition">
        AND IS_DELETED = '0'
-        AND COMPANY_CODE = #companyCode#
+        <isNotEmpty prepend=" AND " property="companyCode">
+            COMPANY_CODE = #companyCode#
+        </isNotEmpty>
        <isNotEmpty prepend=" AND " property="orgEname">
            ORG_ENAME = #orgEname#
        </isNotEmpty>