From e6e459b038ca4bc67e3906eeb304e20a14626496 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Thu, 8 Dec 2022 17:40:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=83=A8=E9=97=A8=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/sso/system/rest/DeptController.java | 14 ++++++++------ .../sso/system/service/impl/MenuServiceImpl.java | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/sso/system/rest/DeptController.java b/lms/nladmin-system/src/main/java/org/nl/sso/system/rest/DeptController.java index 7276e421f..0364e2f45 100644 --- a/lms/nladmin-system/src/main/java/org/nl/sso/system/rest/DeptController.java +++ b/lms/nladmin-system/src/main/java/org/nl/sso/system/rest/DeptController.java @@ -62,13 +62,15 @@ public class DeptController { @ApiOperation("查询部门") @GetMapping("/vo") public ResponseEntity queryvo(DeptQueryCriteria criteria) throws Exception { - if (criteria.getPid() == null){ - criteria.setPidIsNull(true); - } Boolean hasChild = false; - if (StringUtils.isNotEmpty(criteria.getName()) || StringUtils.isNotEmpty(criteria.getIs_used())){ - criteria.setPidIsNull(null); - hasChild=true; + if (criteria.getPidIsNull() == null){ + if (criteria.getPid() == null){ + criteria.setPidIsNull(true); + } + if (StringUtils.isNotEmpty(criteria.getName()) || StringUtils.isNotEmpty(criteria.getIs_used())){ + criteria.setPidIsNull(null); + hasChild=true; + } } List deptDtos = deptService.queryAll(criteria, true); List deptVos = CopyUtil.copyList(deptDtos, DeptVo.class); diff --git a/lms/nladmin-system/src/main/java/org/nl/sso/system/service/impl/MenuServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/sso/system/service/impl/MenuServiceImpl.java index cbfbf00fd..290249549 100644 --- a/lms/nladmin-system/src/main/java/org/nl/sso/system/service/impl/MenuServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/sso/system/service/impl/MenuServiceImpl.java @@ -164,7 +164,7 @@ public class MenuServiceImpl implements MenuService { WQLObject menuTab = WQLObject.getWQLObject("sys_menu"); JSONObject rootMenuObj = menuTab.query("menu_id = '" + rootMenuId + "'").uniqueResult(0); JSONObject param = new JSONObject(); - param.put("system_type", rootMenuObj.getString("title")); + param.put("system_type", rootMenuObj.getString("system_type")); param.put("menu_id", menu_id); menuTab.update(param); }