From b5d55e1dd793c01f08786f805f01345bca64c893 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 03 十一月 2026 09:58:44 +0800
Subject: [PATCH] 代码提交
---
ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java b/ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java
index 0a8d93c..78393a6 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java
@@ -887,7 +887,7 @@
* <p>
* 鍙ｅ緞锛歴ervice_subtask 涓�
* service_type = '2' 鍑洪櫌闅忚 / '3' 闂ㄨ瘖闅忚
- * + 寰呴殢璁跨姸鎬侊紙sendstate in 1,2,3,5,7锛�
+ * + 寰呴殢璁跨姸鎬侊紙sendstate in 1,2,3,7锛屽彂閫佸け璐�(5) 涓嶈鍏ワ級
* + 鍑洪櫌婊� 7 澶╋紙鍚��7 澶╁墠閭ｄ竴澶┿�嶅嚭闄㈢殑鎮ｈ�咃級
* + 鍙湅鏈�杩� 4 涓嚭闄㈡湀浠斤紙鍚綋鏈堬級锛�
* 绉戝/鐥呭尯鏉冮檺鍙� OR锛堜笌闅忚鍒楄〃 deptOrDistrict=2 涓�鑷达級銆�
@@ -921,9 +921,10 @@
List<SysUserDept> sysUserWards = sysUserDeptService.selectSysUserDeptList(wardQuery);
boolean isAdmin = "admin".equals(sysUser.getUserName());
+ // 娌℃湁绉戝/鐥呭尯閰嶇疆鐨勮处鍙凤紙濡傞儴鍒嗙鐞嗗憳璐﹀彿锛夛紝鍒楄〃鏈韩鏄寜 鏈烘瀯+闄㈠尯 鏌ョ殑锛�
+ // 杩欓噷涔熸寜鍚屾牱鍙ｅ緞缁熻锛屽惁鍒欏垪琛ㄦ湁鏁版嵁銆佸崱鐗囧嵈鍏ㄦ槸 0銆�
if (!isAdmin && CollectionUtils.isEmpty(sysUserDepts) && CollectionUtils.isEmpty(sysUserWards)) {
- // 鏃㈡病鏈夌瀹や篃娌℃湁鐥呭尯鏉冮檺鏃朵笉缁熻锛岄伩鍏嶈秺鏉冪湅鍒板叏鏈烘瀯鏁版嵁
- return result;
+ log.info("[pendingTaskMonthStats] 鐢ㄦ埛 {} 鏈厤缃瀹�/鐥呭尯锛屾寜鏈烘瀯+闄㈠尯缁熻", sysUser.getUserName());
}
// sys_user_dept 閲屽悓涓�绉戝/鐥呭尯浼氶噸澶嶅緢澶氳锛屽幓閲嶅悗鍐嶆嫾 IN锛岄伩鍏� SQL 鍙傛暟杩囧
@@ -940,6 +941,8 @@
ServiceSubtaskEntity entity = new ServiceSubtaskEntity();
entity.setOrgid(sysUser.getOrgid());
+ // 涓庡垪琛ㄤ竴鑷达細鎸夌櫥褰曚細璇濋噷鐨勯櫌鍖鸿繃婊わ紙鐧诲綍椤甸�夋嫨鐨勯櫌鍖猴級
+ entity.setCampusid(sysUser.getCampusid());
entity.setLeaveldeptcodes(deptCodes);
entity.setLeavehospitaldistrictcodes(wardCodes);
@@ -1060,9 +1063,9 @@
userId = loginUser.getUser().getUserId();
}
if (serviceSubtaskEntity.getSendstateView() != null) {
- // 1锛氬緟闅忚锛�1 琚鍙栥��2 寰呭彂閫併��3 宸插彂閫併��5 鍙戦�佸け璐ャ��7銆佽秴鏃讹級锛�2锛氬凡瀹屾垚锛� 6 宸插畬鎴愶級銆�3锛氭棤闇�闅忚锛�4 涓嶆墽琛岋級
+ // 1锛氬緟闅忚锛�1 琚鍙栥��2 寰呭彂閫併��3 宸插彂閫併��7 瓒呮椂锛涘彂閫佸け璐�(5) 鍗曠嫭缁熻锛夛紱2锛氬凡瀹屾垚锛� 6 宸插畬鎴愶級銆�3锛氭棤闇�闅忚锛�4 涓嶆墽琛岋級
if (serviceSubtaskEntity.getSendstateView() == 1)
- serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 5L, 7L)));
+ serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 7L)));
if (serviceSubtaskEntity.getSendstateView() == 2)
serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(6L)));
if (serviceSubtaskEntity.getSendstateView() == 3)
--
Gitblit v1.9.3