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

src/main/java/com/baosight/hpjx/hp/bi/sql/HPBI003.xml

@@ -22,9 +22,7 @@
         join iplat.TXSOG01 b on a.GROUP_CODE = b.ORG_ID and b.IS_DELETED = 0
         join hpjx.t_hpsb002 c on a.DEVICE_CODE=c.EQUIPMENT_CODE
         where a.DELETE_FLAG = 0 and DEVICE_STATUS = 1 and c.EQUIPMENT_TYPE = 'STARUS_TYPE'
-        <isNotEmpty prepend=" AND " property="companyCode">
-            a.COMPANY_CODE = #companyCode#
-        </isNotEmpty>
+              and a.COMPANY_CODE = #companyCode#
         <isNotEmpty prepend=" AND " property="factoryCode">
             a.FACTORY_CODE = #factoryCode#
         </isNotEmpty>