diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdLeave.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdLeave.java index 6f9bddf..3eb0319 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdLeave.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdLeave.java @@ -84,7 +84,20 @@ public class TdLeave extends BaseEntity @Excel(name = "审核意见", readConverterExp = "0=通过,1不通过,2审核中") private String examinestate; - public void setId(Long id) + /** + * 部门 + */ + private Long deptId; + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + public void setId(Long id) { this.id = id; } @@ -209,6 +222,7 @@ public class TdLeave extends BaseEntity .append("examinename", getExaminename()) .append("examinedate", getExaminedate()) .append("examinestate", getExaminestate()) + .append("deptId", getDeptId()) .toString(); } } diff --git a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml index c1afbf6..6f992a8 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml @@ -18,10 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select u.id, u.user_id, u.user_name, u.country, u.areaname, u.leavereason, u.depart, u.leavedate, u.workstate, u.leavestate, u.examinename, u.examinedate, u.examinestate from td_leave u + select u.id, u.user_id, u.user_name, u.country, u.areaname, u.leavereason, u.depart, u.leavedate, u.workstate, u.leavestate, u.examinename, u.examinedate, u.examinestate,dept_id from td_leave u