Merge remote-tracking branch 'origin/master'

linwe

2024-05-17 1b4822da66a05ee7647f5f86a9f18f15dadb0a25

 src/main/java/org/springblade/modules/rotation/service/impl/RotationServiceImpl.java

@@ -93,6 +93,15 @@
         }
         rotation.setPropertyFlag(1);
      }
      if(AuthUtils.isMj(userRole)){
         rotation.setType(1);
      }
      if(AuthUtils.isJd(userRole)){
         rotation.setType(2);
      }
      if(AuthUtils.isAdministratorOrAdmin(userRole)){
         rotation.setType(null);
      }
      if (StringUtils.isNotBlank(rotation.getAoiCode())) {
         // 查询房屋的小区
         IDistrictService bean = SpringUtils.getBean(IDistrictService.class);