From fee8fbb72f73cc11075b07bf457ce2dd2a9ce19e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 05 Jul 2024 11:15:47 +0800
Subject: [PATCH] 无诈代码优化
---
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
index a6f42e0..af93105 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -455,7 +455,7 @@
}
}
// 判断是否租户导入
- if (StringUtils.isNotBlank(isTenant) || householdEntity.getRelationship() == 18) {
+ if (StringUtils.isNotBlank(isTenant) || (householdEntity.getRelationship() != null && householdEntity.getRelationship() == 18)) {
householdEntity.setRelationship(18);
HouseRentalEntity houseRentalEntity = iHouseRentalService.getOne(Wrappers.<HouseRentalEntity>lambdaQuery()
.eq(HouseRentalEntity::getHouseCode, householdEntity.getHouseCode()).last("limit 1"));
@@ -619,8 +619,8 @@
HouseholdVO householdVO = new HouseholdVO();
householdVO.setConfirmFlag(confirmFlag);
householdVO.setCommunityCode(neiCode);
+ householdVO.setUserId(AuthUtil.getUserId());
CommonParamSet commonParamSet = new CommonParamSet().invoke(HouseholdVO.class, householdVO);
-
return baseMapper.statistics(householdVO, commonParamSet.getIsAdministrator(),
commonParamSet.getRegionChildCodesList(), commonParamSet.getGridCodeList());
}
@@ -650,15 +650,16 @@
@Override
public Object getHouseHoldStatistics(String code, String roleType) {
Map<String, Object> objectObjectHashMap = new HashMap<>();
+ List<String> communityCodeList = Func.toStrList(code);
if (roleType.equals("2")) {
- List<Map<String, Object>> result = baseMapper.getHouseHoldStatistics(code, null, roleType);
- List<Map<String, Object>> result1 = baseMapper.getHouseHoldStatisticsAge(code, null, roleType);
+ List<Map<String, Object>> result = baseMapper.getHouseHoldStatistics(communityCodeList, null, roleType);
+ List<Map<String, Object>> result1 = baseMapper.getHouseHoldStatisticsAge(communityCodeList, null, roleType);
objectObjectHashMap.put("gender", result);
objectObjectHashMap.put("age", result1);
return objectObjectHashMap;
} else {
- List<Map<String, Object>> result = baseMapper.getHouseHoldStatistics(code, AuthUtil.getUserId(), roleType);
- List<Map<String, Object>> result1 = baseMapper.getHouseHoldStatisticsAge(code, AuthUtil.getUserId(), roleType);
+ List<Map<String, Object>> result = baseMapper.getHouseHoldStatistics(communityCodeList, AuthUtil.getUserId(), roleType);
+ List<Map<String, Object>> result1 = baseMapper.getHouseHoldStatisticsAge(communityCodeList, AuthUtil.getUserId(), roleType);
objectObjectHashMap.put("gender", result);
objectObjectHashMap.put("age", result1);
return objectObjectHashMap;
--
Gitblit v1.9.3