Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
cms_sys
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
西魏
cms_sys
Commits
ba09b022
Commit
ba09b022
authored
Jan 20, 2020
by
huise
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '5.0.0' of
https://gitee.com/shangg/MCMS
parents
1e56e0f6
97565180
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
3 deletions
+2
-3
ICategoryDao.xml
src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml
+2
-3
1577692394350.jpg
...ain/webapp/static/ms-admin/5.0.0/images/1577692394350.jpg
+0
-0
1577694374686.png
...ain/webapp/static/ms-admin/5.0.0/images/1577694374686.png
+0
-0
No files found.
src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml
View file @
ba09b022
...
@@ -174,7 +174,7 @@
...
@@ -174,7 +174,7 @@
and
and
(
(
<if
test=
"categoryParentId != null and categoryParentId!=''"
>
<if
test=
"categoryParentId != null and categoryParentId!=''"
>
CATEGORY_PARENT_ID like '%${categoryParentId}%'
find_in_set(#{categoryParentId},CATEGORY_PARENT_ID)
</if>
</if>
<if
test=
"categoryParentId == null or categoryParentId ==''"
>
<if
test=
"categoryParentId == null or categoryParentId ==''"
>
<include
refid=
"queryWhereCategoryId"
></include>
<include
refid=
"queryWhereCategoryId"
></include>
...
@@ -237,4 +237,4 @@
...
@@ -237,4 +237,4 @@
order by id desc
order by id desc
</select>
</select>
</mapper>
</mapper>
\ No newline at end of file
src/main/webapp/static/ms-admin/5.0.0/images/1577692394350.jpg
0 → 100644
View file @
ba09b022
115 KB
src/main/webapp/static/ms-admin/5.0.0/images/1577694374686.png
0 → 100644
View file @
ba09b022
79.1 KB
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment