diff --git a/jeecg-boot/docker-compose-business.yml b/jeecg-boot/docker-compose-business.yml index 4cad10c..dfe42e7 100644 --- a/jeecg-boot/docker-compose-business.yml +++ b/jeecg-boot/docker-compose-business.yml @@ -1,5 +1,5 @@ ## 商业版试用镜像提供源下载,仅限于个人学习用途,如擅自用于商业用途,带来的一切后果由个人负责 -## !!!!暂未完善,如有需求请联系作者!!!!! +## !!!!暂未完善,如有需求请联系作者!!!!! 直接部署,只支持本机部署和访问,服务端部署需调整参数 ##执行启动命令 docker-compose -f ./docker-compose-business.yml up version: '2' services: diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java index bb899d8..6cf0211 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java @@ -45,7 +45,7 @@ import java.util.stream.Collectors; public class SysCategoryController { @Autowired private ISysCategoryService sysCategoryService; - + /** * 分页列表查询 * @param sysCategory @@ -63,7 +63,7 @@ public class SysCategoryController { sysCategory.setPid("0"); } Result> result = new Result>(); - + //--author:os_chengtgen---date:20190804 -----for: 分类字典页面显示错误,issues:377--------start //QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysCategory, req.getParameterMap()); QueryWrapper queryWrapper = new QueryWrapper(); @@ -112,8 +112,8 @@ public class SysCategoryController { result.setResult(list); return result; } - - + + /** * 添加 * @param sysCategory @@ -123,7 +123,7 @@ public class SysCategoryController { public Result add(@RequestBody SysCategory sysCategory) { Result result = new Result(); try { - if(!sysCategory.getPid().isEmpty() && !sysCategory.getPid().equals("0") && + if(oConvertUtils.isNotEmpty(sysCategory.getPid()) && !sysCategory.getPid().equals("0") && sysCategory.getRecommend() != null && sysCategory.getRecommend() == true) return Result.error("只允许推荐根节点的专题"); @@ -136,7 +136,7 @@ public class SysCategoryController { } return result; } - + /** * 编辑 * @param sysCategory @@ -156,7 +156,7 @@ public class SysCategoryController { } return result; } - + /** * 通过id删除 * @param id @@ -172,10 +172,10 @@ public class SysCategoryController { this.sysCategoryService.deleteSysCategory(id); result.success("删除成功!"); } - + return result; } - + /** * 批量删除 * @param ids @@ -192,7 +192,7 @@ public class SysCategoryController { } return result; } - + /** * 通过id查询 * @param id @@ -291,9 +291,9 @@ public class SysCategoryController { } return Result.error("文件导入失败!"); } - - - + + + /** * 加载单个数据 用于回显 */ @@ -301,7 +301,7 @@ public class SysCategoryController { public Result loadOne(@RequestParam(name="field") String field,@RequestParam(name="val") String val) { Result result = new Result(); try { - + QueryWrapper query = new QueryWrapper(); query.eq(field, val); List ls = this.sysCategoryService.list(query); @@ -322,7 +322,7 @@ public class SysCategoryController { } return result; } - + /** * 加载节点的子数据 */ @@ -340,7 +340,7 @@ public class SysCategoryController { } return result; } - + /** * 加载一级节点/如果是同步 则所有数据 -- 知识库专题 */