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

 Conflicts:
	src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml

@@ -327,9 +327,8 @@
 		DELIVERY_DATE as "deliveryDate"
 		FROM
 		hpjx.t_hpsc002
-		WHERE
-		1=1
-		<include refid="authCondition"/>
+		WHERE 1=1
+        <include refid="authCondition"/>
 		<isNotEmpty prepend=" AND " property="pEname">
 			PARENT_ID = #pEname#
 		</isNotEmpty>
@@ -362,9 +361,10 @@
 		DELIVERY_DATE as "deliveryDate"
 		FROM
 		hpjx.t_hpsc002
-		WHERE
-		1=1 AND PARENT_ID NOT IN ('root') AND LV != 3
-		<include refid="authCondition"/>
+		WHERE 1=1
+        <include refid="authCondition"/>
+        AND PARENT_ID NOT IN ('root')
+        AND LV != 3
 		<isNotEmpty prepend=" AND " property="pEname">
 			PARENT_ID = #pEname#
 		</isNotEmpty>
@@ -398,9 +398,8 @@
 		DELIVERY_DATE as "deliveryDate"
 		FROM
 		hpjx.t_hpsc002
-		WHERE
-		1=1
-		<include refid="authCondition"/>
+		WHERE 1=1
+        <include refid="authCondition"/>
 		<isNotEmpty prepend=" AND " property="pEname">
 			PARENT_ID = #pEname#
 		</isNotEmpty>