src/main/java/org/springblade/common/utils/RoleUtil.java
New file @@ -0,0 +1,19 @@ package org.springblade.common.utils; import java.util.UUID; public class RoleUtil { /** * 判断是否物业人员 * * @return */ public static boolean isProperty(String userRole) { if (userRole.contains("wygly") || userRole.contains("wyxmjl") || userRole.contains("wyfwry")) { return true; } return false; } } src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.common.cache.SysCache; 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.SpringUtil; @@ -50,7 +51,7 @@ // List<String> collect = list.stream().map(PropertyCompanyDistrictEntity::getDistrictId).collect(Collectors.toList()); // article.setDistrictIdList(collect); // } 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()); src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
@@ -22,6 +22,7 @@ import org.springblade.common.cache.SysCache; import org.springblade.common.node.TreeStringNode; import org.springblade.common.utils.NodeTreeUtil; 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.SpringUtil; @@ -89,7 +90,7 @@ public Object getDistrictTree(DistrictVO district) { // 判断角色，物业角色只能查询当前小区的 String userRole = AuthUtil.getUserRole(); if (userRole.contains("wygly") || userRole.contains("wyxmjl")) { if (RoleUtil.isProperty(userRole)) { if (district.getFilterFlag().equals(1)) { // 查询小区id IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class); src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
@@ -27,6 +27,7 @@ import org.slf4j.LoggerFactory; 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.log.exception.ServiceException; import org.springblade.core.secure.utils.AuthUtil; @@ -85,7 +86,7 @@ Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2; // 判断角色，物业角色只能查询当前小区的 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()); src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java
@@ -4,6 +4,7 @@ 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.utils.RoleUtil; import org.springblade.common.utils.SpringUtils; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.Func; @@ -47,7 +48,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); 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,7 +233,7 @@ @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())); src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springblade.common.cache.SysCache; import org.springblade.common.param.CommonParamSet; import org.springblade.common.utils.RoleUtil; import org.springblade.common.utils.SpringUtils; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.utils.AuthUtil; @@ -92,7 +93,7 @@ } String userRole = AuthUtil.getUserRole(); List<String> aoiCodeList = new ArrayList<>(); if (userRole.contains("wygly") || userRole.contains("wyxmjl")|| userRole.contains("wyfwry")) { if (RoleUtil.isProperty(userRole)) { taskReportForRepairs.setRoleType("wy"); // 查询小区id IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class);
