From 10c5239343be8dd379a405e98fa22b8c4cd410f1 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 19 Jan 2024 14:26:27 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java b/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
index dc03796..407d5c8 100644
--- a/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
@@ -134,12 +134,25 @@
} catch (Exception e) {
throw new ServiceException("街道信息不存在");
}
- // 查询住建局负责人
+ // 查询信州区住建局负责人
User user4 = null;
try {
- Region region2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 6)));
- Dept dept3 = dept.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, region2.getName() + "住建局").last("limit 1"));
+// Region region2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 6)));
+ Dept dept3 = dept.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, "信州区" + "住建局").last("limit 1"));
user4 = user.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, dept3.getId())
+ .eq(User::getRoleId, "1738072768615333890")
+ .eq(User::getIsDeleted, 0)
+ .last("limit 1"));
+ } catch (Exception e) {
+ throw new ServiceException("住建局信息不存在");
+ }
+
+ // 查询上饶市住建局负责人
+ User user5 = null;
+ try {
+// Region region2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 6)));
+ Dept dept3 = dept.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, "上饶市" + "住建局").last("limit 1"));
+ user5 = user.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, dept3.getId())
.eq(User::getRoleId, "1738072768615333890")
.eq(User::getIsDeleted, 0)
.last("limit 1"));
@@ -159,6 +172,7 @@
.set("ownersCommitteeUser", TaskUtil.getTaskUser(one.getPrincipalId().toString()))
.set("streetUser", TaskUtil.getTaskUser(one4.getId().toString()))
.set("constructionUser", TaskUtil.getTaskUser(user4.getId().toString()))
+ .set("srConstructionUser", TaskUtil.getTaskUser(user5.getId().toString()))
.set("applyUser", TaskUtil.getTaskUser(AuthUtil.getUserId().toString()))
.set("ownersCommitteeFlag", ownersCommitteeFlag);
} else {
@@ -176,6 +190,7 @@
.set(ProcessConstant.TASK_VARIABLE_CREATE_USER, AuthUtil.getUserName())
.set("streetUser", TaskUtil.getTaskUser(one4.getId().toString()))
.set("constructionUser", TaskUtil.getTaskUser(user4.getId().toString()))
+ .set("srConstructionUser", TaskUtil.getTaskUser(user5.getId().toString()))
.set("applyUser", TaskUtil.getTaskUser(AuthUtil.getUserId().toString()))
.set("ownersCommitteeFlag", ownersCommitteeFlag);
}
--
Gitblit v1.9.3