diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java index 61b9a913..a78daffd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java @@ -58,6 +58,11 @@ public class SysDept extends TenantEntity { */ private Long leader; + /** + * 分管副总 + */ + private Long vicePresident; + /** * 联系电话 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java index 0d8ac84b..78484809 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java @@ -55,6 +55,11 @@ public class SysDeptBo extends BaseEntity { */ private Long leader; + /** + * 分管副总 + */ + private Long vicePresident; + /** * 联系电话 */ 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 5163cbf2..fb407122 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 @@ -6,6 +6,8 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; import org.dromara.system.domain.SysDept; import java.io.Serial; @@ -74,8 +76,21 @@ public class SysDeptVo implements Serializable { * 负责人 */ @ExcelProperty(value = "负责人") + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "leader") private String leaderName; + /** + * 分管副总ID + */ + private Long vicePresident; + + /** + * 分管副总 + */ + @ExcelProperty(value = "分管副总") + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "vicePresident") + private String vicePresidentName; + /** * 联系电话 */