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/PropertyCompanyServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
index 2b3c36d..65e16c2 100644
--- a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
@@ -22,6 +22,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.CommonConstant;
+import org.springblade.common.utils.RoleUtil;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
@@ -41,6 +42,8 @@
import org.springblade.modules.property.service.IPropertyDistrictUserService;
import org.springblade.modules.property.vo.PropertyCompanyDetailVO;
import org.springblade.modules.property.vo.PropertyCompanyVO;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.property.vo.PropertyDistrictInfo;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.entity.UserDept;
@@ -207,7 +210,8 @@
public PropertyCompanyDetailVO getPayConfig(PropertyCompanyVO propertyCompany) {
- PropertyCompanyDetailVO detail = this.getDetail(propertyCompany);
+// PropertyCompanyDetailVO detail = this.getDetail(propertyCompany);
+ PropertyCompanyDetailVO detail = baseMapper.getDetailVO(propertyCompany);
AliPayInfo pA = new AliPayInfo();
@@ -229,14 +233,19 @@
@Override
public PropertyCompanyDetailVO getDetailByDeptId() {
String userRole = AuthUtil.getUserRole();
- if (userRole.contains("wygly")) {
+ if (RoleUtil.isProperty(userRole)) {
// 通过用户机构查询用户的物业公司
IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
- PropertyCompanyEntity propertyCompanyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
+ PropertyCompanyEntity propertyCompanyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()).last("limit 1"));
if (propertyCompanyEntity != null) {
- return baseMapper.getDetail(BeanUtil.copyProperties(propertyCompanyEntity, PropertyCompanyVO.class));
+ return baseMapper.getDetailVO(BeanUtil.copyProperties(propertyCompanyEntity, PropertyCompanyVO.class));
}
}
return null;
}
+
+ @Override
+ public PropertyDistrictInfo getPropertyDistrictInfo(PropertyDistrictInfo propertyDistrictInfo) {
+ return baseMapper.getPropertyDistrictInfo(propertyDistrictInfo);
+ }
}
--
Gitblit v1.9.3