Merge remote-tracking branch 'origin/master'

linwe

2023-11-24 8a28bb397d5743edf1da5930db0d6d0fdd86b35e

 src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java

@@ -17,6 +17,7 @@
package org.springblade.modules.district.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.modules.district.entity.DistrictEntity;
import org.springblade.modules.district.vo.DistrictVO;
import org.springblade.modules.district.mapper.DistrictMapper;
@@ -39,5 +40,13 @@
      return page.setRecords(baseMapper.selectDistrictPage(page, district));
   }


   /**
    * 获取小区树
    * @param district
    * @return
    */
   @Override
   public Object getDistrictTree(DistrictVO district) {
      return NodeTreeUtil.getStringNodeTree(baseMapper.getDistrictTree(district));
   }
}