Merge remote-tracking branch 'origin/master'

xuhy

2024-10-31 ca01cb6a493c9b3ddf6508a458e6c561fe0f81a8

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileNotificationServiceImpl.java

@@ -83,7 +83,8 @@
            }
         }
      }else{
         siteIds = new HashSet<>(siteId);
         siteIds = new HashSet<>();
         siteIds.add(siteId);
      }
      PageInfo<TChargingPileNotification> pageInfo = new PageInfo<>(basePage.getPageCurr(), basePage.getPageSize());
      List<TChargingPileNotification> list = this.baseMapper.chargingPileNotificationPageList(pageInfo, siteIds);
@@ -97,17 +98,18 @@
      switch (type){
         case 1:
            // 验证码
            notification.setPhone(phone);
            notification.setContent(data);
            notification.setSiteId(null);
            notification.setChargingPileId(null);
            break;
         default:
            // 停车占位
            notification.setSiteId(siteId);
            notification.setChargingPileId(chargingPileId);
            notification.setPhone(phone);
            notification.setContent(data);
            break;
      }
      notification.setPhone(phone);
      notification.setContent(data);
      this.save(notification);
   }

}