记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
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
董敬伟
liquidnet-bus-v1
Commits
b13db4ed
Commit
b13db4ed
authored
Nov 07, 2022
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
~admin:平台分类重复校验逻辑调整,页面分页模块去除;
parent
f1b59171
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
GoblinSelfCategoryAdminController.java
...er/zhengzai/goblin/GoblinSelfCategoryAdminController.java
+9
-9
category.html
...esources/templates/zhengzai/goblin/category/category.html
+3
-3
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfCategoryAdminController.java
View file @
b13db4ed
...
...
@@ -130,9 +130,9 @@ public class GoblinSelfCategoryAdminController extends BaseController {
if
(
catePidObj
.
getName
().
equals
(
name
.
trim
()))
{
return
AjaxResult
.
warn
(
"分类名称与父级分类重复,请核实"
);
}
if
(
goblinSelfGoodsCategoryService
.
countForMatchName
(
catePid
,
name
.
trim
())
>
0
)
{
return
AjaxResult
.
warn
(
"分类名称重复,请核实"
);
}
//
if (goblinSelfGoodsCategoryService.countForMatchName(catePid, name.trim()) > 0) {
//
return AjaxResult.warn("分类名称重复,请核实");
//
}
break
;
case
"3"
:
queryWrapper
.
eq
(
GoblinSelfGoodsCategory:
:
getCateId
,
catePid
).
eq
(
GoblinSelfGoodsCategory:
:
getGrade
,
"2"
);
...
...
@@ -140,12 +140,12 @@ public class GoblinSelfCategoryAdminController extends BaseController {
if
(
null
==
catePidObj
)
{
return
AjaxResult
.
warn
(
"父级分类无效"
);
}
if
(
catePidObj
.
getName
().
equals
(
name
.
trim
()))
{
return
AjaxResult
.
warn
(
"分类名称与父级分类重复,请核实"
);
}
if
(
goblinSelfGoodsCategoryService
.
countForMatchName
(
catePidObj
.
getCatePid
(),
name
.
trim
())
>
0
)
{
return
AjaxResult
.
warn
(
"分类名称重复,请核实"
);
}
//
if (catePidObj.getName().equals(name.trim())) {
//
return AjaxResult.warn("分类名称与父级分类重复,请核实");
//
}
//
if (goblinSelfGoodsCategoryService.countForMatchName(catePidObj.getCatePid(), name.trim()) > 0) {
//
return AjaxResult.warn("分类名称重复,请核实");
//
}
break
;
default
:
return
AjaxResult
.
warn
(
"分类层级无效"
);
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/category/category.html
View file @
b13db4ed
...
...
@@ -117,9 +117,9 @@
<!-- </a>-->
</div>
<div
class=
"col-sm-12 select-table table-striped"
>
<table
id=
"bootstrap-table"
></table
>
</div
>
<!-- <div class="col-sm-12 select-table table-striped">--
>
<!-- <table id="bootstrap-table"></table>--
>
<!-- </div>--
>
<div
id=
"addClassify"
>
</div>
...
...
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