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

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC001.xml

@@ -78,8 +78,11 @@
 			proj_code = #projCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projName">
-			proj_name like '%$projName$%'
+			proj_name like concat('%', #projName#, '%')
 		</isNotEmpty>
+        <isNotEmpty prepend=" AND " property="projectName">
+            proj_name like concat('%', #projectName#, '%')
+        </isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projType">
 			proj_type = #projType#
 		</isNotEmpty>

src/main/java/com/baosight/hggp/hg/xs/sql/HGXSUser.xml

@@ -30,7 +30,7 @@
             ACCOUNT_CODE = #accountCode#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="receiveUserName">
-            USER_NAME LIKE CONCAT('%', #accountCode#, '%')
+            USER_NAME LIKE CONCAT('%', #receiveUserName#, '%')
         </isNotEmpty>
     </sql>