From 17b8fad8bbf13dd6f6e2c1e300856c52dce4f3ee Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 12 十二月 2025 14:45:36 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_community
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
index 7a26248..d43104f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
@@ -142,7 +142,8 @@
@GetMapping(value = "/keyPersonnelSituation")
public R<List<TLargeKeyPersonnelType>> keyPersonnelSituation() {
List<TLargeKeyPersonnelType> list = largeKeyPersonnelTypeService.list();
- List<TLargeKeyGridUser> largeKeyGridUsers = largeKeyGridUserService.list();
+ List<TLargeKeyGridUser> largeKeyGridUsers = largeKeyGridUserService.list(Wrappers.lambdaQuery(TLargeKeyGridUser.class)
+ .eq(TLargeKeyGridUser::getUserType, 1));
for (TLargeKeyPersonnelType largeKeyPersonnelType : list) {
if(largeKeyPersonnelType.getShowType() == 2 && !CollectionUtils.isEmpty(largeKeyGridUsers)){
// 查询真实的汇总数据
--
Gitblit v1.7.1