From d3c223eaa4df46d17c138ef8ed5eab8da9638416 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 10 Apr 2024 18:38:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
index 2f222c5..2efcf77 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
@@ -73,7 +73,10 @@
public IPage<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage<TaskReportForRepairsVO> page, TaskReportForRepairsVO taskReportForRepairs) {
// 公共参数设置
CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskReportForRepairsVO.class, taskReportForRepairs);
- taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
+ String userRole = AuthUtil.getUserRole();
+ if (RoleUtil.isProperty(userRole) || RoleUtil.isWgy(userRole)){
+ taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
+ }
if (null != taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")) {
if (taskReportForRepairs.getRoleName().equals("inhabitant")) {
taskReportForRepairs.setCreateUser(AuthUtil.getUserId());
@@ -82,7 +85,6 @@
taskReportForRepairs.setRoleType("inhabitant");
}
}
- String userRole = AuthUtil.getUserRole();
List<String> aoiCodeList = new ArrayList<>();
if (RoleUtil.isProperty(userRole)) {
taskReportForRepairs.setRoleType("wy");
@@ -91,7 +93,10 @@
List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
// 通过用户机构查询用户的物业公司
IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
- PropertyCompanyEntity companyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
+ PropertyCompanyEntity companyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery()
+ .eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId())
+ .eq(PropertyCompanyEntity::getIsDeleted, 0)
+ .last("limit 1"));
if (companyEntity != null) {
IPropertyCompanyDistrictService bean2 = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
// 通过物业公司，查询小区
@@ -121,9 +126,10 @@
*/
@Override
public TaskReportStatistics getStatisticsCount(String houseCode) {
- List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
- Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
- return baseMapper.getStatisticsCount(AuthUtil.getUserId(), houseCode, regionChildCodesList, isAdministrator);
+ TaskReportForRepairsVO reportForRepairsVO = new TaskReportForRepairsVO();
+ reportForRepairsVO.setHouseCode(houseCode);
+ CommonParamSet invoke = new CommonParamSet<>().invoke(TaskReportForRepairsVO.class, reportForRepairsVO);
+ return baseMapper.getStatisticsCount(AuthUtil.getUserId(), houseCode, invoke.getRegionChildCodesList(), invoke.getIsAdministrator());
}
/**
--
Gitblit v1.9.3