From d5676268553f8010268b00b4f1de63182a592713 Mon Sep 17 00:00:00 2001 From: s1431_z_w <15596413+s1431zw@user.noreply.gitee.com> Date: Tue, 16 Sep 2025 19:10:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E5=81=87=E6=B5=81=E7=A8=8B=E8=BF=9B?= =?UTF-8?q?=E4=B8=80=E6=AD=A5=E5=AE=8C=E5=96=84=EF=BC=8C=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=80=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/srs/flowable/listener/BoStartListener.java | 3 ++- .../srs/flowable/listener/LeadAuditListener.java | 14 +++++++++++--- .../srs/flowable/listener/LeadEentListener.java | 3 ++- .../java/com/srs/flowable/mapper/LeaveMapper.java | 6 +++--- .../src/main/resources/mapper/LeaveMapper.xml | 8 +++++--- 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/BoStartListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/BoStartListener.java index 5d653e4..56419f2 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/listener/BoStartListener.java +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/BoStartListener.java @@ -38,7 +38,8 @@ public class BoStartListener implements ExecutionListener { StuLeaveApplication stuLeaveApplication = leaveMapper.selectRtStuLeaveApplicationByLeaveApplicationId(leaveApplicationId); // 获取校领导信息 - List lingDataInfo = leaveMapper.getLingDataInfo(185362L); + String roleKey = "xldsp"; //角色key + List lingDataInfo = leaveMapper.getShenDataInfo(roleKey); // 设置流程变量 //delegateExecution.setVariable("approval", secondaryLeaderInfo.getUserId()); diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/LeadAuditListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/LeadAuditListener.java index 378b040..6d79f9d 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/listener/LeadAuditListener.java +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/LeadAuditListener.java @@ -104,9 +104,13 @@ public class LeadAuditListener implements ExecutionListener { notificationManage.setSender(Long.parseLong(approval)); // 发送方 } if(leaveDay >= 8 && leaveDay <= 14) { + //获取学工领导信息 + String roleKey = "xgldsp"; //角色key + List xueDataInfo = leaveMapper.getShenDataInfo(roleKey); + //查询指定用户的通知信息 notificationManage.setContent("您有一条【二级学院书记已提交请假申请审批】需待处理"); // 消息内容 - notificationManage.setReceiver(Long.parseLong("185043")); //接收人需添加appvoval + notificationManage.setReceiver(Long.parseLong(xueDataInfo.get(0).getUserId().toString())); //接收人需添加appvoval//185043 NotificationManage userManage = leaveMapper.selectCphMsgListForFlowable(notificationManage); if(userManage != null) { //删除指定通知信息 @@ -119,8 +123,12 @@ public class LeadAuditListener implements ExecutionListener { notificationManage.setSender(Long.parseLong(approval)); // 发送方 } if(leaveDay >= 15 && leaveDay <= 30) { + //获取校领导信息 + String roleKey = "xldsp"; //角色key + List lingDataInfo = leaveMapper.getShenDataInfo(roleKey); + notificationManage.setContent("您有一条【学工领导已提交请假申请审批】需待处理"); // 消息内容 - notificationManage.setReceiver(185362L); //接收人 + notificationManage.setReceiver(lingDataInfo.get(0).getUserId()); //接收人185362 NotificationManage userManage = leaveMapper.selectCphMsgListForFlowable(notificationManage); if(userManage != null) { //删除指定通知信息 @@ -130,7 +138,7 @@ public class LeadAuditListener implements ExecutionListener { //构建通知信息内容 notificationManage.setContent("您有一条【学院领导已提交请假申请审批】待处理"); // 消息内容 - notificationManage.setSender(185362L); // 发送方 + notificationManage.setSender(lingDataInfo.get(0).getUserId()); // 发送方185362 } notificationManage.setReceiver(shenUserInfo.getUserId()); notificationManage.setCreateTime(DateUtils.getNowDate()); diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/LeadEentListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/LeadEentListener.java index e942d72..62d7871 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/listener/LeadEentListener.java +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/LeadEentListener.java @@ -51,7 +51,8 @@ public class LeadEentListener implements ExecutionListener { // 获取校领导信息 //TeacherVo updateDeptId = leaveMapper.getUpdateDeptId(SecurityUtils.getUserId().toString()); - List lingDataInfo = leaveMapper.getLingDataInfo(185362L); + String roleKey = "xldsp"; //角色key + List lingDataInfo = leaveMapper.getShenDataInfo(roleKey); if (stuLeaveApplication != null) { // 同意 diff --git a/srs-flowable/src/main/java/com/srs/flowable/mapper/LeaveMapper.java b/srs-flowable/src/main/java/com/srs/flowable/mapper/LeaveMapper.java index 834cfc7..136e54f 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/mapper/LeaveMapper.java +++ b/srs-flowable/src/main/java/com/srs/flowable/mapper/LeaveMapper.java @@ -87,12 +87,12 @@ public interface LeaveMapper { List getUpdateDeptIdInfo(Long deptId); /** - * 获取校领导信息 - * @param userId + * 获取审批用户信息 + * @param roleKey * @return * 邵政文 */ - List getLingDataInfo(Long userId); + List getShenDataInfo(String roleKey); /** * 获取请假申请人信息 diff --git a/srs-flowable/src/main/resources/mapper/LeaveMapper.xml b/srs-flowable/src/main/resources/mapper/LeaveMapper.xml index 26b4404..306ad1b 100644 --- a/srs-flowable/src/main/resources/mapper/LeaveMapper.xml +++ b/srs-flowable/src/main/resources/mapper/LeaveMapper.xml @@ -71,10 +71,12 @@ WHERE a.dept_id=#{deptId} AND c.post_code='jwcgl' - - SELECT a.user_id userId,a.dept_id deptId,a.nick_name userNick,a.user_name userName FROM sys_user a - WHERE a.user_id=#{userId} + LEFT JOIN sys_user_role b ON a.user_id = b.user_id + LEFT JOIN sys_role c ON b.role_id=c.role_id + WHERE c.role_key=#{roleKey}