Merge branch 'developerB' of http://git.caimei365.com/caimei365/caimei365-www into developerB

src/main/resources/mapper/BaseMapper.xml

@@ -18,9 +18,9 @@
             sort
 		from new_page_first_navigation
 		where wwwEnabledStatus='1' and delFlag = 0
-        <if test="type != null and type != ''">
-            <if test="type == 0 and type ==0">and (type = 0 or type is null )</if>
-            <if test="type != 0 and type !=0">and type = #{type}</if>
+        <if test="type != null ">
+            <if test="type == 0 ">and (type = 0 or type is null )</if>
+            <if test="type != 0 ">and type = #{type}</if>
         </if>
 		order by sort asc,createDate desc
 		limit 8