Merge remote-tracking branch 'origin/master'

linwei

2024-01-02 9cc50d2e2c3fcfff3c6b95c09806d3881a97c5ff

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

@@ -495,7 +495,7 @@

   @Override
   public List<UserEntity> getUserInfoByCode(String houseCode, String type) {
      if (type.equals("1")) {
      if (type.equals("0")) {
         IGridmanService bean = SpringUtil.getBean(IGridmanService.class);
         return bean.getGridManByCode(houseCode);
      } else {
@@ -503,4 +503,9 @@
         return bean1.getDistictUserByCode(houseCode);
      }
   }

   @Override
   public List<UserEntity> getUserInfoByDistrictId(String districtId, String building) {
      return baseMapper.getUserInfoByDistrictId(districtId, building);
   }
}