From 4203c28f06c08155b3f4163c23f7b115f38fc8a5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 21 三月 2023 20:01:35 +0800
Subject: [PATCH] 修改密码策略部分接口

---
 Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/controller/StrategyController.java |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/controller/StrategyController.java b/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/controller/StrategyController.java
index 16ed941..be8eb8a 100644
--- a/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/controller/StrategyController.java
+++ b/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/controller/StrategyController.java
@@ -1,17 +1,16 @@
 package org.springblade.system.controller;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
-import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.system.entity.Strategy;
 import org.springblade.system.service.IStrategyService;
+import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
@@ -43,16 +42,15 @@
 	/**
 	 * 鍒嗛〉鏌ヨ
 	 *
-	 * @param strategy 绛涢�夋潯浠�
-	 * @param query      鍒嗛〉瀵硅薄
+	 * @param query 鍒嗛〉瀵硅薄
 	 * @return 鏌ヨ缁撴灉
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "鍒嗛〉鏌ヨ", notes = "浼犲叆combination锛屽垎椤靛弬鏁皅uery")
-	public R<IPage<Strategy>> queryByPage(Strategy strategy, Query query) {
-		IPage<Strategy> pages = strategyService.page(Condition.getPage(query), Condition.getQueryWrapper(strategy));
-		return R.data(pages);
+	public R<Page<Strategy>> queryByPage(Query query) {
+		Page<Strategy> strategyPage = strategyService.queryAllByPage(query);
+		return R.data(strategyPage);
 	}
 
 	/**
@@ -90,7 +88,7 @@
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "鍒犻櫎", notes = "浼犲叆ids")
-	public ResponseEntity<Boolean> deleteById(List<String> ids) {
+	public ResponseEntity<Boolean> deleteById(@ApiParam(value = "涓婚敭闆嗗悎", required = true) @RequestParam List<String> ids) {
 		return ResponseEntity.ok(this.strategyService.deleteByIds(ids));
 	}
 

--
Gitblit v1.9.3