From 2dad58eb94e729b2efd51ebac7fcc773aca80ded Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 03 Apr 2024 14:02:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
index 0a3c8b8..defb6e2 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
@@ -752,18 +752,19 @@
@Override
public List<Map<String, Object>> labelStatistics(HouseVO house) {
- List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
- Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
- return baseMapper.labelStatistics(house, regionChildCodesList, isAdministrator);
+ CommonParamSet commonParamSet = new CommonParamSet<>().invoke(HouseVO.class, house);
+ return baseMapper.labelStatistics(house, commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator());
}
@Override
public List<Map<String, Object>> labelCommunityStatistics(HouseVO house) {
- List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
- Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
- List<Map<String, Object>> list = baseMapper.labelCommunityStatistics(house, regionChildCodesList);
+ CommonParamSet commonParamSet = new CommonParamSet<>().invoke(HouseVO.class, house);
+ List<Map<String, Object>> list = baseMapper.labelCommunityStatistics(house, commonParamSet.getRegionChildCodesList());
for (Map<String, Object> map : list) {
- List<LabelVO> code = baseMapper.getlabelCount(house, regionChildCodesList, isAdministrator, map.get("code").toString());
+ List<LabelVO> code = baseMapper.getlabelCount(house,
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator(),
+ map.get("code").toString());
map.put("child",code);
}
return list;
--
Gitblit v1.9.3