From f17a6dbf2290f73ced65e03121d0998d1416c959 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 26 Dec 2023 16:01:58 +0800
Subject: [PATCH] bug修复

---
 src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
index 9430922..c2e033e 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
@@ -127,26 +127,29 @@
 	}
 
 	@Override
-	public Object countTypeNumber() {
+	public Object countTypeNumber(Integer roleType, String neiCode) {
 		TaskVO taskVO = new TaskVO();
 		Map<String, Object> objectObjectHashMap = new HashMap<>();
 		taskVO.setStatus(1);
+		taskVO.setUserId(roleType > 0 ? AuthUtil.getUserId() : null);
+		taskVO.setNeiCode(neiCode);
 		taskVO.setReportType(2);
-		// 标签时间
+		// 标签事件
 		Integer bqsj = baseMapper.selectTaskCount(taskVO);
 		taskVO.setReportType(1);
-		// 标签时间
+		// 取保候审
 		Integer qbhs = baseMapper.selectTaskCount(taskVO);
 		// 报事报修
-		Integer bsbx = SpringUtils.getBean(ITaskReportForRepairsService.class).getStatistics(AuthUtil.getUserId(), "");
+		Integer bsbx = SpringUtils.getBean(ITaskReportForRepairsService.class).getStatistics(roleType > 0 ? AuthUtil.getUserId() : null, neiCode);
 		// 住房审核
-		Integer zhsh = iHouseholdService.statistics(AuthUtil.getUserId(),"");
+		Integer zhsh = iHouseholdService.statistics(roleType > 0 ? AuthUtil.getUserId() : null, neiCode);
 		// 出租审核
 		HouseRentalTenantVO houseRentalTenantVO = new HouseRentalTenantVO();
-		houseRentalTenantVO.setUserId(AuthUtil.getUserId());
+		houseRentalTenantVO.setUserId(roleType > 0 ? AuthUtil.getUserId() : null);
+		houseRentalTenantVO.setNeiCode(neiCode);
 		Integer czsh = iHouseRentalService.getStatisticsCount(houseRentalTenantVO);
 		// 场所审核
-		Integer cssh = SpringUtils.getBean(IPlaceExtService.class).selectCount(AuthUtil.getUserId(), "", 1);
+		Integer cssh = SpringUtils.getBean(IPlaceExtService.class).selectCount(roleType > 0 ? AuthUtil.getUserId() : null, neiCode, 1);
 		objectObjectHashMap.put("qbhs", qbhs);
 		objectObjectHashMap.put("bqsj", bqsj);
 		objectObjectHashMap.put("bsbx", bsbx);

--
Gitblit v1.9.3