From 835e13d88ca9af920a137cd74edbc34e5436cbc8 Mon Sep 17 00:00:00 2001 From: wangxy <1481820854@qq.com> Date: Fri, 1 Nov 2024 08:48:22 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=A6=BB=E8=81=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/system/service/impl/TdLeaveServiceImpl.java | 3 ++- .../src/main/resources/mapper/system/TdLeaveMapper.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdLeaveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdLeaveServiceImpl.java index 413c83f..16b9a34 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdLeaveServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdLeaveServiceImpl.java @@ -40,8 +40,9 @@ public class TdLeaveServiceImpl implements ITdLeaveService * @param tdLeave 人员离职 * @return 人员离职 */ + + @DataScope(deptAlias = "d") @Override - @DataScope(userAlias="u") public List selectTdLeaveList(TdLeave tdLeave) { return tdLeaveMapper.selectTdLeaveList(tdLeave); diff --git a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml index 6f992a8..9ef1011 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml @@ -22,7 +22,7 @@ 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,dept_id from td_leave u + select id, user_id, user_name, country, areaname, leavereason, depart, leavedate, workstate, leavestate, examinename, examinedate, examinestate,dept_id from td_leave d