From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 54dfd06..b0f6810 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;
@@ -232,12 +233,12 @@
@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()));
if (propertyCompanyEntity != null) {
- return baseMapper.getDetail(BeanUtil.copyProperties(propertyCompanyEntity, PropertyCompanyVO.class));
+ return baseMapper.getDetailVO(BeanUtil.copyProperties(propertyCompanyEntity, PropertyCompanyVO.class));
}
}
return null;
--
Gitblit v1.9.3