From b627e9b177de4d16f38dcb19941722c8ca7a8edc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 30 九月 2024 11:55:32 +0800
Subject: [PATCH] 合併代碼
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
index 1add52d..82e9536 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
@@ -164,6 +164,8 @@
PageInfo<GetSiteListDTO> list = siteService.getSiteList(siteList);
return AjaxResult.success(list);
}
+
+
@GetMapping("/getSiteList/byUserId")
@ApiOperation(value = "获取站点列表", tags = {"管理后台-站点管理"})
public R<List<GetSiteListDTO>> getSiteListByUserId(@RequestParam("userId") Long userId){
@@ -424,7 +426,7 @@
@ResponseBody
@PostMapping("/getSiteByIds")
public R<List<Site>> getSiteByIds(@RequestBody List<Integer> ids){
- List<Site> sites = siteService.listByIds(ids);
+ List<Site> sites = siteService.list(new LambdaQueryWrapper<Site>().in(Site::getId, ids).eq(Site::getDelFlag, 0));
return R.ok(sites);
}
--
Gitblit v1.7.1