From fe59ae00aef5cdbc39c6d1b29c84af25071a32ff Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 10 May 2024 16:42:46 +0800
Subject: [PATCH] 防诈宣传优化
---
src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java
index 3fcdef0..ebe61f2 100644
--- a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java
+++ b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
+import org.springblade.common.exception.CustomException;
+import org.springblade.common.utils.RoleUtil;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
@@ -47,7 +49,7 @@
public IPage<PropertyCompanyDistrictVO> selectPropertyCompanyDistrictPage(IPage<PropertyCompanyDistrictVO> page, PropertyCompanyDistrictVO propertyCompanyDistrict) {
// 物业 查询用户管理的小区
String userRole = AuthUtil.getUserRole();
- if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
+ if (RoleUtil.isProperty(userRole)) {
propertyCompanyDistrict.setDeptId(AuthUtil.getDeptId());
// 查询小区id
IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class);
@@ -83,7 +85,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean saveOrUpdatePropertyCompanyDistrict(PropertyCompanyDistrictEntity propertyCompanyDistrict) throws Exception {
+ public boolean saveOrUpdatePropertyCompanyDistrict(PropertyCompanyDistrictEntity propertyCompanyDistrict) {
// IUserService bean = SpringUtil.getBean(IUserService.class);
// User user = bean.getOne(Wrappers.<User>lambdaQuery().eq(User::getId, propertyCompanyDistrict.getPrincipal()));
// if (StringUtils.isNotBlank(user.getRoleId())) {
@@ -102,7 +104,7 @@
.eq(PropertyCompanyDistrictEntity::getPropertyCompanyId, propertyCompanyDistrict.getPropertyCompanyId())
.eq(PropertyCompanyDistrictEntity::getIsDeleted, 0));
if (count > 0) {
- throw new Exception("您已有该小区的合同，请勿重复添加！");
+ throw new CustomException("您已有该小区的合同，请勿重复添加！");
}
// bean.updateById(user);
return save(propertyCompanyDistrict) && submitPropertyDistrictUser(propertyCompanyDistrict);
--
Gitblit v1.9.3