记得上下班打卡 | git大法好,push需谨慎

Commit b13db4ed authored by 张国柄's avatar 张国柄

~admin:平台分类重复校验逻辑调整,页面分页模块去除;

parent f1b59171
...@@ -130,9 +130,9 @@ public class GoblinSelfCategoryAdminController extends BaseController { ...@@ -130,9 +130,9 @@ public class GoblinSelfCategoryAdminController extends BaseController {
if (catePidObj.getName().equals(name.trim())) { if (catePidObj.getName().equals(name.trim())) {
return AjaxResult.warn("分类名称与父级分类重复,请核实"); return AjaxResult.warn("分类名称与父级分类重复,请核实");
} }
if (goblinSelfGoodsCategoryService.countForMatchName(catePid, name.trim()) > 0) { // if (goblinSelfGoodsCategoryService.countForMatchName(catePid, name.trim()) > 0) {
return AjaxResult.warn("分类名称重复,请核实"); // return AjaxResult.warn("分类名称重复,请核实");
} // }
break; break;
case "3": case "3":
queryWrapper.eq(GoblinSelfGoodsCategory::getCateId, catePid).eq(GoblinSelfGoodsCategory::getGrade, "2"); queryWrapper.eq(GoblinSelfGoodsCategory::getCateId, catePid).eq(GoblinSelfGoodsCategory::getGrade, "2");
...@@ -140,12 +140,12 @@ public class GoblinSelfCategoryAdminController extends BaseController { ...@@ -140,12 +140,12 @@ public class GoblinSelfCategoryAdminController extends BaseController {
if (null == catePidObj) { if (null == catePidObj) {
return AjaxResult.warn("父级分类无效"); return AjaxResult.warn("父级分类无效");
} }
if (catePidObj.getName().equals(name.trim())) { // if (catePidObj.getName().equals(name.trim())) {
return AjaxResult.warn("分类名称与父级分类重复,请核实"); // return AjaxResult.warn("分类名称与父级分类重复,请核实");
} // }
if (goblinSelfGoodsCategoryService.countForMatchName(catePidObj.getCatePid(), name.trim()) > 0) { // if (goblinSelfGoodsCategoryService.countForMatchName(catePidObj.getCatePid(), name.trim()) > 0) {
return AjaxResult.warn("分类名称重复,请核实"); // return AjaxResult.warn("分类名称重复,请核实");
} // }
break; break;
default: default:
return AjaxResult.warn("分类层级无效"); return AjaxResult.warn("分类层级无效");
......
...@@ -117,9 +117,9 @@ ...@@ -117,9 +117,9 @@
<!-- </a>--> <!-- </a>-->
</div> </div>
<div class="col-sm-12 select-table table-striped"> <!-- <div class="col-sm-12 select-table table-striped">-->
<table id="bootstrap-table"></table> <!-- <table id="bootstrap-table"></table>-->
</div> <!-- </div>-->
<div id="addClassify"> <div id="addClassify">
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment