Merge remote-tracking branch 'origin/master'

linwei

2024-01-24 bdc5d99198b06b9e3fd5e6794d2efea36398b60a

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

@@ -154,8 +154,8 @@
      String regionCode = null;
      if (null != dept) {
         regionCode = dept.getRegionCode();
         if (StringUtils.isNotBlank(regionCode) && regionCode.equals("361100000000")) {
            regionCode = "361102000000";
         if (StringUtils.isNotBlank(regionCode) && regionCode.equals("361100")) {
            regionCode = "361102";
         }
      }
      return NodeTreeUtil.getStringNodeTree(baseMapper.getTownTree(regionCode));