From 680a9877fe64c40aced1f4e04ea34056fac204fc Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: Thu, 19 Mar 2026 14:03:30 +0800
Subject: [PATCH] 支持多部门
---
gkhy-system/src/main/java/com/gkhy/system/service/impl/DailySafetyInspectionServiceImpl.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/gkhy-system/src/main/java/com/gkhy/system/service/impl/DailySafetyInspectionServiceImpl.java b/gkhy-system/src/main/java/com/gkhy/system/service/impl/DailySafetyInspectionServiceImpl.java
index 0392d7c..9c43752 100644
--- a/gkhy-system/src/main/java/com/gkhy/system/service/impl/DailySafetyInspectionServiceImpl.java
+++ b/gkhy-system/src/main/java/com/gkhy/system/service/impl/DailySafetyInspectionServiceImpl.java
@@ -21,6 +21,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -130,16 +131,35 @@
@Override
public int getCheckCount() {
- Long deptId = SecurityUtils.getDeptId();
- SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
- if (sysDept == null){
+ Long[] deptIds = SecurityUtils.getDeptIds();
+ if (ObjectUtil.isEmpty(deptIds)){
return 1;
- }else {
- if (!"1".equals(sysDept.getSafety())){
- return 1;
+ }
+ List<SysDept> sysDepts = sysDeptMapper.selectDeptByIds(deptIds);
+ if (ObjectUtil.isEmpty(sysDepts)){
+ return 1;
+ }
+ List<Long> data = new ArrayList<>();
+ for (SysDept sysDept : sysDepts) {
+ if ("1".equals(sysDept.getSafety())){
+ data.add(sysDept.getDeptId());
}
}
- return dailySafetyInspectionMapper.getCheckCount(deptId);
+ if (ObjectUtil.isEmpty(data)){
+ return 1;
+ }
+ return dailySafetyInspectionMapper.getCheckCountList(data);
+
+// Long deptId = SecurityUtils.getDeptId();
+// SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
+// if (sysDept == null){
+// return 1;
+// }else {
+// if (!"1".equals(sysDept.getSafety())){
+// return 1;
+// }
+// }
+ // return dailySafetyInspectionMapper.getCheckCount(deptId);
}
--
Gitblit v1.9.2