优化首页企业数

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/lyservice/mapper/xml/LyServiceMapper.xml

@@ -106,7 +106,7 @@
 		AND DATE_FORMAT(create_date, '%Y-%m-%d') >= #{beginTime} AND DATE_FORMAT(create_date, '%Y-%m-%d') <= #{endTime}
 		</if>
 		) b ON a.id = b.qy_id
-		WHERE a.del_flag = 0 AND des13 IS NOT NULL
+		WHERE a.del_flag = 0 AND (des13 IS NOT NULL OR des13 != '')
 		<if test="des1 != ''">
 			AND des1 = #{des1}
 		</if>
@@ -126,12 +126,12 @@
 	<select id="getCompanyInfo" resultType="Map">
 		SELECT b.id AS sum,des13,des14,des1,name FROM ly_enterprise_info a
 		LEFT JOIN
-		(SELECT * FROM ly_service WHERE del_flag = 0 AND (des13 IS NOT NULL OR des13 != '')
+		(SELECT * FROM ly_service WHERE del_flag = 0
 		<if test="beginTime != ''">
 			AND DATE_FORMAT(create_date, '%Y-%m-%d') >= #{beginTime} AND DATE_FORMAT(create_date, '%Y-%m-%d') &lt;= #{endTime}
 		</if>
 		) b ON a.id = b.qy_id
-		WHERE a.del_flag = 0 AND des13 IS NOT NULL
+		WHERE a.del_flag = 0 AND (des13 IS NOT NULL OR des13 != '')
 		<if test="des1 != ''">
 			AND des1 = #{des1}
 		</if>