驾驶舱添加社区筛选优化

linwe

2024-06-24 60e1a68fa319cd9e92d632bf678b31af20973508

 src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java

@@ -31,7 +31,6 @@
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.ObjectUtil;
import org.springblade.modules.backblast.entity.BackblastPubRecordEntity;
import org.springblade.modules.category.dto.CategoryDTO;
import org.springblade.modules.category.service.ICategoryService;
import org.springblade.modules.community.entity.CommunityEntity;
@@ -46,7 +45,6 @@
import org.springblade.modules.doorplateAddress.vo.FuncNode;
import org.springblade.modules.grid.entity.GridEntity;
import org.springblade.modules.grid.entity.GridRangeEntity;
import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.grid.service.IGridRangeService;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.service.IGridmanService;
@@ -66,10 +64,8 @@
import org.springblade.modules.place.service.IPlaceExtService;
import org.springblade.modules.place.service.IPlacePoiLabelService;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.service.IRegionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -150,10 +146,8 @@
      String roleName = SpringUtils.getRequestParam("roleName");
      if (!Strings.isBlank(roleName)) {
         // 如果是网格管理员，系统管理员,民警,无诈场所采集
         if (roleName.equals("admin") ||
            roleName.equals("wzcj") ||
            roleName.equals("wgy") ||
            roleName.equals("mj")) {
         if (roleName.equals("admin") || roleName.equals("wzcj") ||
            roleName.equals("wgy") || roleName.equals("mj")) {
            houseParam.setRoleName(roleName);
            if ((roleName.equals("wgy") || roleName.equals("wzcj"))
               && !userId.equals("1726859808689696770")) {
@@ -169,6 +163,10 @@
            List<TreeStringNode> townList = baseMapper.getRegionListByGroupTwon(houseParam, stringList, communityList);
            // 查询社区
            List<TreeStringNode> neiList = baseMapper.getRegionListByGroupNei(houseParam, stringList, communityList);
            // 查询网格
            if (stringList.size() > 0) {
               List<GridEntity> list1 = gridService.list(Wrappers.<GridEntity>lambdaQuery().in(GridEntity::getGridCode, stringList));
            }
            // 遍历
            for (TreeStringNode treeNode : townList) {
               // 遍历