Merge branch '5.0.0' of https://gitee.com/shangg/MCMS

src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml

@@ -174,7 +174,7 @@
 			and
 			(
 			<if test="categoryParentId != null and categoryParentId!=''">
-				CATEGORY_PARENT_ID like '%${categoryParentId}%'
+				find_in_set(#{categoryParentId},CATEGORY_PARENT_ID)
 			</if>
 			<if test="categoryParentId == null or  categoryParentId ==''">
 				<include refid="queryWhereCategoryId"></include>
@@ -237,4 +237,4 @@
 		order by id desc
 	</select>
 
-</mapper>
+</mapper>