linwe
2023-12-25 b738548b942265ec7fc487bdd2017d7d91da26f1
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -20,15 +20,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.constant.DictConstant;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.utils.ComplexNumberStringComparator;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.category.dto.CategoryLabelDTO;
import org.springblade.modules.category.service.ICategoryLabelService;
import org.springblade.modules.category.dto.CategoryDTO;
import org.springblade.modules.category.service.ICategoryService;
import org.springblade.modules.community.entity.CommunityEntity;
import org.springblade.modules.community.service.ICommunityService;
import org.springblade.modules.district.entity.DistrictEntity;
@@ -95,7 +94,7 @@
   private IDistrictService districtService;
   @Autowired
   private ICategoryLabelService iCategoryLabelService;
   private ICategoryService iCategoryService;
   @Autowired
   private ICommunityService communityService;
@@ -181,10 +180,10 @@
      List<TreeStringNode> placeNodeList = placeService.selectPlaceNodeList(AuthUtil.getUserId());
      for (TreeStringNode treeNode : placeNodeList) {
         treeNode.setAddressType(2);
         CategoryLabelDTO categoryLabelDTO = new CategoryLabelDTO();
         categoryLabelDTO.setPlaceId(treeNode.getId());
         List<CategoryLabelDTO> categoryLabelDTOS = iCategoryLabelService.selectCategoryLabelList(categoryLabelDTO);
         treeNode.setCategoryLabelList(categoryLabelDTOS);
         CategoryDTO categoryDTO = new CategoryDTO();
         categoryDTO.setPlaceId(treeNode.getId());
         List<CategoryDTO> categoryDTOS = iCategoryService.selectCategoryLabelList(categoryDTO);
         treeNode.setCategoryList(categoryDTOS);
//         if (DictConstant.SMALL_DOORPLATE.equals(treeNode.getDoorplateType()) ||
//            (DictConstant.centre_DOORPLATE.equals(treeNode.getDoorplateType()) &&
//               treeNode.getAddressLevel().equals(1))) {