From af4b0cb1079490e2b1e9b83161abf9aac7cd04d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Wed, 9 Aug 2023 12:06:05 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20!pr410=20=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=9A=84=E7=94=A8=E6=88=B7=E5=AF=BC=E5=87=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/dromara/system/domain/vo/SysDeptVo.java | 7 ++++++- .../org/dromara/system/domain/vo/SysUserExportVo.java | 4 ++-- .../src/main/resources/mapper/system/SysUserMapper.xml | 8 ++++++-- 3 files changed, 14 insertions(+), 5 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 671e5793..c4dd412b 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 @@ -57,11 +57,16 @@ public class SysDeptVo implements Serializable { */ private Integer orderNum; + /** + * 负责人ID + */ + private Long leader; + /** * 负责人 */ @ExcelProperty(value = "负责人") - private Long leader; + private String leaderName; /** * 联系电话 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java index d01b3df5..3cc5186c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java @@ -92,8 +92,8 @@ public class SysUserExportVo implements Serializable { /** * 负责人 */ - @ReverseAutoMapping(target = "leader", source = "dept.leader") + @ReverseAutoMapping(target = "leaderName", source = "dept.leaderName") @ExcelProperty(value = "部门负责人") - private Long leader; + private String leaderName; } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 0b67a339..f813ca06 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -67,17 +67,21 @@