Merge remote-tracking branch 'origin/master'

linwei

2024-02-20 e67a8a7477096a295d65afa1c366d2b59f8752fc

 src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java

@@ -162,14 +162,16 @@
    */
   @Override
   public List<TreeStringNode> getTownTree(String code) {
      Dept dept = deptService.getById(AuthUtil.getDeptId());
      String regionCode = null;
      if (!AuthUtil.isAdministrator() && !AuthUtil.isAdmin()){
         Dept dept = deptService.getById(AuthUtil.getDeptId());
      if (null != dept) {
         regionCode = dept.getRegionCode();
         if (StringUtils.isNotBlank(regionCode) && regionCode.equals("361100")) {
            regionCode = "361102";
         }
      }
      }
      return NodeTreeUtil.getStringNodeTree(baseMapper.getTownTree(regionCode));
   }