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

6 years ago · ba09b022c4
parent 1e56e0f641 9756518080
commit ba09b022c4
3 changed files with 2 additions and 2 deletions
--- a/src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml
+++ b/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>
--- a/src/main/webapp/static/ms-admin/5.0.0/images/1577692394350.jpg
+++ b/src/main/webapp/static/ms-admin/5.0.0/images/1577692394350.jpg
--- a/src/main/webapp/static/ms-admin/5.0.0/images/1577694374686.png
+++ b/src/main/webapp/static/ms-admin/5.0.0/images/1577694374686.png