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

ba09b022 · huise · 1e56e0f6 · 97565180 · ba09b022 · ba09b022
Commit ba09b022 authored Jan 20, 2020 by huise
3 changed files
--- 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>

--- 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