From 566e7986291e73051d30ee252b0ebf852b1577a7 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 02 Apr 2024 14:25:51 +0800
Subject: [PATCH] 娱乐场所标签新增180200
---
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 fc82ab8..b75e55d 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");
@@ -92,7 +94,9 @@
// 通过用户机构查询用户的物业公司
IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
PropertyCompanyEntity companyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery()
- .eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()).last("limit 1"));
+ .eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId())
+ .eq(PropertyCompanyEntity::getIsDeleted, 0)
+ .last("limit 1"));
if (companyEntity != null) {
IPropertyCompanyDistrictService bean2 = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
// 通过物业公司，查询小区
--
Gitblit v1.9.3