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

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>