From fa2f172812de8344fa22c4ef088ea2a67257a0d3 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期二, 05 九月 2023 10:21:17 +0800 Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/dmMes into dev --- server/src/main/java/doumeemes/api/ext/CategoryExtController.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/server/src/main/java/doumeemes/api/ext/CategoryExtController.java b/server/src/main/java/doumeemes/api/ext/CategoryExtController.java index 3993e09..bfab39a 100644 --- a/server/src/main/java/doumeemes/api/ext/CategoryExtController.java +++ b/server/src/main/java/doumeemes/api/ext/CategoryExtController.java @@ -63,12 +63,14 @@ Category query = new Category(); query.setDeleted(Constants.ZERO); + query.setCateType(category.getCateType()); query.setRootDepartId(getLoginUser().getRootDepartment().getId()); query.setCode(category.getCode()); List<Category> list = categoryService.findList(query); Category query1 = new Category(); query1.setDeleted(Constants.ZERO); + query1.setCateType(category.getCateType()); query1.setRootDepartId(getLoginUser().getRootDepartment().getId()); query1.setName(category.getName()); List<Category> list1 = categoryService.findList(query1); -- Gitblit v1.9.3