From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 43be807..5559fc3 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
@@ -27,6 +27,8 @@
import org.slf4j.LoggerFactory;
import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.CommonConstant;
+import org.springblade.common.param.CommonParamSet;
+import org.springblade.common.utils.RoleUtil;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
@@ -43,6 +45,7 @@
import org.springblade.modules.district.service.IDistrictService;
import org.springblade.modules.ownersCommittee.entity.OwnersCommitteeEntity;
import org.springblade.modules.ownersCommittee.service.IOwnersCommitteeService;
+import org.springblade.modules.partyOrganization.vo.PartyOrganizationVO;
import org.springblade.modules.property.entity.PropertyCapitalApplyEntity;
import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
@@ -81,18 +84,16 @@
@Override
public IPage<PropertyCapitalApplyVO> selectPropertyCapitalApplyPage(IPage<PropertyCapitalApplyVO> page, PropertyCapitalApplyVO propertyCapitalApply) {
- List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
- Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
+ CommonParamSet commonParamSet = new CommonParamSet<>().invoke(PropertyCapitalApplyVO.class, propertyCapitalApply);
// 判断角色，物业角色只能查询当前小区的
String userRole = AuthUtil.getUserRole();
- if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
+ if (RoleUtil.isProperty(userRole)) {
// 查询小区id
IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class);
List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
// 通过用户机构查询用户的物业公司
- // 通过用户机构查询用户的物业公司
IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
- PropertyCompanyEntity one = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
+ PropertyCompanyEntity one = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()).last("limit 1"));
if (one != null) {
IPropertyCompanyDistrictService bean2 = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
// 通过物业公司，查询小区
@@ -108,7 +109,8 @@
return page.setRecords(new ArrayList<>());
}
}
- return page.setRecords(baseMapper.selectPropertyCapitalApplyPage(page, propertyCapitalApply, regionChildCodesList, isAdministrator));
+ return page.setRecords(baseMapper.selectPropertyCapitalApplyPage(page, propertyCapitalApply,
+ commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator()));
}
@Autowired
@@ -156,7 +158,7 @@
.eq(Dept::getDeptName, regionServiceOne.getName()));
jdUserInfo = userService.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, deptServiceOne.getId())
- .eq(User::getRoleId, "1729814500990304258").eq(User::getIsDeleted, 0).last("limit 1"));
+ .like(User::getRoleId, "1729814500990304258").eq(User::getIsDeleted, 0).last("limit 1"));
if (jdUserInfo == null) {
logger.error("街道信息不存在***");
throw new ServiceException("街道信息不存在");
@@ -171,7 +173,7 @@
// Region region2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 6)));
Dept dept3 = deptService.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, "信州区" + "住建局").last("limit 1"));
xzUserInfo = userService.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, dept3.getId())
- .eq(User::getRoleId, "1738072768615333890").eq(User::getIsDeleted, 0).last("limit 1"));
+ .like(User::getRoleId, "1738072768615333890").eq(User::getIsDeleted, 0).last("limit 1"));
if (xzUserInfo == null) {
logger.error("信州区住建局信息不存在***");
throw new ServiceException("信州区住建局信息不存在");
@@ -187,7 +189,7 @@
// Region region2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 6)));
Dept dept3 = deptService.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, "上饶市" + "住建局").last("limit 1"));
srUserInfo = userService.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, dept3.getId())
- .eq(User::getRoleId, "1738072768615333890").eq(User::getIsDeleted, 0).last("limit 1"));
+ .like(User::getRoleId, "1738072768615333890").eq(User::getIsDeleted, 0).last("limit 1"));
if (srUserInfo == null) {
logger.error("上饶市住建局信息不存在***");
throw new ServiceException("上饶市住建局信息不存在");
--
Gitblit v1.9.3