From 479b17a8c25375ec2f9d1045c676f99d8779ed41 Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Thu, 16 May 2024 17:57:49 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=8F=96=E6=B6=88=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=88=B6=E9=83=A8=E9=97=A8=E7=B1=BB=E5=88=AB=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/dromara/system/domain/vo/SysDeptVo.java | 5 ----- .../dromara/system/service/impl/SysDeptServiceImpl.java | 7 ++----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java index cb4fb162d..c56fb09bc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java @@ -41,11 +41,6 @@ public class SysDeptVo implements Serializable { */ private String parentName; - /** - * 父部门类别编码 - */ - private String parentCategory; - /** * 祖级列表 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java index f8d52038e..cb3f340d8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java @@ -135,11 +135,8 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { return null; } SysDeptVo parentDept = baseMapper.selectVoOne(new LambdaQueryWrapper() - .select(SysDept::getDeptName, SysDept::getDeptCategory).eq(SysDept::getDeptId, dept.getParentId())); - if (ObjectUtil.isNotNull(parentDept)) { - dept.setParentName(parentDept.getDeptName()); - dept.setParentCategory(parentDept.getDeptCategory()); - } + .select(SysDept::getDeptName).eq(SysDept::getDeptId, dept.getParentId())); + dept.setParentName(ObjectUtil.isNotNull(parentDept) ? parentDept.getDeptName() : null); return dept; }