Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

无关风月

2024-11-01 f91bb885d680d3f30cbf1bcffdd6819b3b10e6b1

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

@@ -293,9 +293,9 @@
   public PageInfo<SiteVO> pageList(SiteQuery query,Integer isLogin) {
      TAppUser appUser = null;
      // 获取当前登录用户id
      Long userId = tokenService.getLoginUserApplet().getUserId();
      TAppUserVipDetail data1 = null;
      if(isLogin == 1){
         Long userId = tokenService.getLoginUserApplet().getUserId();
         // 根据id查询用户信息
         appUser = appUserClient.getUserById(userId).getData();
         GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
@@ -396,9 +396,9 @@
      }
      TAppUser appUser = null;
      // 获取当前登录用户id
      Long userId = tokenService.getLoginUserApplet().getUserId();
      TAppUserVipDetail data1 = null;
      if(isLogin == 1){
         Long userId = tokenService.getLoginUserApplet().getUserId();
         // 根据id查询用户信息
         appUser = appUserClient.getUserById(userId).getData();
         GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();