linwe
2024-05-20 ebc6b7119046a51ed2b9ecf727ac8c9466b6700d
社区判断是否过滤
3 files modified
20 ■■■■■ changed files
src/main/java/org/springblade/modules/system/controller/RegionController.java 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/service/IRegionService.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java 14 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/controller/RegionController.java
@@ -142,8 +142,8 @@
     */
    @GetMapping("/treeToCommunity")
    @ApiOperation(value = "树列表-查询到社区的树", notes = "传入menu")
    public R treeToCommunity() {
        return R.data(regionService.treeToCommunity());
    public R treeToCommunity(@RequestParam(value = "isFiter",required = false) String isFiter) {
        return R.data(regionService.treeToCommunity(isFiter));
    }
    /**
src/main/java/org/springblade/modules/system/service/IRegionService.java
@@ -143,5 +143,5 @@
     * 树列表-查询到社区的树
     * @return
     */
    List<TreeStringNode> treeToCommunity();
    List<TreeStringNode> treeToCommunity(String isFiter);
}
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
@@ -17,10 +17,8 @@
package org.springblade.modules.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
@@ -46,7 +44,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static org.springblade.common.cache.RegionCache.*;
@@ -350,12 +347,19 @@
    /**
     * 树列表-查询到社区的树
     *
     * @return
     */
    @Override
    public List<TreeStringNode> treeToCommunity() {
    public List<TreeStringNode> treeToCommunity(String isFiter) {
        List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId(), null);
        Integer isAdministrator = AuthUtils.isAdministratorOrAdmin(AuthUtil.getUserRole()) == true ? 1 : 2;
        Integer isAdministrator;
        // 判断是否是超级管理员,并且是否过滤,isfiter为空时,过滤
        if (StringUtils.isBlank(isFiter)) {
            isAdministrator = AuthUtils.isAdministratorOrAdmin(AuthUtil.getUserRole()) == true ? 1 : 2;
        } else {
            isAdministrator = 1;
        }
        // 查询
        Map<String, TreeStringNode> treeList = baseMapper.treeToCommunity(regionChildCodesList, isAdministrator);
        return NodeTreeUtil.getStringNodeTree(treeList);