From 579f5ecc15a375651956485f6086c4b8e1eef088 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 30 一月 2026 17:43:17 +0800
Subject: [PATCH] fix: 员工总数更改为只统计在职人员数据
---
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
index ae752df..454c7a8 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -627,9 +627,9 @@
for (SysDept dept : depts) {
if ("0".equals(dept.getStatus()) && "0".equals(dept.getDelFlag())) {
- Long count = sysUserDeptMapper.selectCount(new LambdaQueryWrapper<SysUserDept>()
- .eq(SysUserDept::getDeptId, dept.getDeptId()));
- if (count > 0) {
+ Long count = staffOnJobMapper.selectCount(new QueryWrapper<StaffOnJob>()
+ .eq("sys_dept_id", dept.getDeptId()).eq("staff_state", 1));
+ if (count != null && count > 0) {
Map<String, Object> map = new HashMap<>();
map.put("name", dept.getDeptName());
map.put("count", count);
@@ -689,12 +689,11 @@
}
private Long countStaff(LocalDateTime dateTime) {
- Long sysUserCount = sysUserMapper.selectCount(new LambdaQueryWrapper<SysUser>()
- .eq(SysUser::getDelFlag, "0")
- .le(SysUser::getCreateTime, dateTime));
Long staffCountItem = staffOnJobMapper.selectCount(new LambdaQueryWrapper<StaffOnJob>()
+ .isNotNull(StaffOnJob::getStaffState)
+ .eq(StaffOnJob::getStaffState, 1)
.le(StaffOnJob::getCreateTime, dateTime));
- return sysUserCount + staffCountItem;
+ return staffCountItem;
}
private Long countCustomers(LocalDateTime dateTime) {
--
Gitblit v1.9.3