From 60e1a68fa319cd9e92d632bf678b31af20973508 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 24 Jun 2024 19:12:05 +0800
Subject: [PATCH] 驾驶舱添加社区筛选优化

---
 src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java b/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java
index f9bc88c..79ef377 100644
--- a/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java
+++ b/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java
@@ -26,6 +26,7 @@
 import org.springblade.common.param.CommonParamSet;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.modules.grid.entity.GridEntity;
 import org.springblade.modules.grid.entity.GridmanEntity;
@@ -277,17 +278,18 @@
 	@Override
 	public Object getGridStatistics(String code, String roleType) {
 		Map<String, Object> objectObjectHashMap = new HashMap<>();
+		List<String> communityCodeList = Func.toStrList(code);
 		if (roleType.equals("2")) {
-			Integer gridStatistics = baseMapper.getGridStatistics(code, null, roleType);
-			Integer companyStatistics = baseMapper.getCompanyStatistics(code, null, roleType);
-			Integer ownersCommitteeStatistics = baseMapper.getOwnersCommitteeStatistics(code, null, roleType);
+			Integer gridStatistics = baseMapper.getGridStatistics(communityCodeList, null, roleType);
+			Integer companyStatistics = baseMapper.getCompanyStatistics(communityCodeList, null, roleType);
+			Integer ownersCommitteeStatistics = baseMapper.getOwnersCommitteeStatistics(communityCodeList, null, roleType);
 			objectObjectHashMap.put("gridStatistics", gridStatistics);
 			objectObjectHashMap.put("companyStatistics", companyStatistics);
 			objectObjectHashMap.put("ownersStatistics", ownersCommitteeStatistics);
 		} else {
-			Integer gridStatistics = baseMapper.getGridStatistics(code, AuthUtil.getUserId(), roleType);
-			Integer companyStatistics = baseMapper.getCompanyStatistics(code, AuthUtil.getUserId(), roleType);
-			Integer ownersCommitteeStatistics = baseMapper.getOwnersCommitteeStatistics(code, AuthUtil.getUserId(), roleType);
+			Integer gridStatistics = baseMapper.getGridStatistics(communityCodeList, AuthUtil.getUserId(), roleType);
+			Integer companyStatistics = baseMapper.getCompanyStatistics(communityCodeList, AuthUtil.getUserId(), roleType);
+			Integer ownersCommitteeStatistics = baseMapper.getOwnersCommitteeStatistics(communityCodeList, AuthUtil.getUserId(), roleType);
 			objectObjectHashMap.put("gridStatistics", gridStatistics);
 			objectObjectHashMap.put("companyStatistics", companyStatistics);
 			objectObjectHashMap.put("ownersStatistics", ownersCommitteeStatistics);

--
Gitblit v1.9.3