From 773c1d40e9081d8eed0c4da2fe5c8201df57f918 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 07 Aug 2024 16:25:43 +0800
Subject: [PATCH] sql 输入 1=1 返回正常的结果问题处理

---
 src/main/java/org/springblade/modules/system/controller/LogUsualController.java |    4 ++--
 src/main/java/org/springblade/modules/system/controller/MenuController.java     |    4 ++--
 src/main/java/org/springblade/modules/system/controller/TenantController.java   |    4 ++--
 src/main/java/org/springblade/modules/system/controller/UserController.java     |    4 ++--
 src/main/java/org/springblade/modules/system/controller/DictBizController.java  |    4 ++--
 src/main/java/org/springblade/modules/system/controller/LogErrorController.java |    4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/controller/DictBizController.java b/src/main/java/org/springblade/modules/system/controller/DictBizController.java
index 733f1f6..5c6d783 100644
--- a/src/main/java/org/springblade/modules/system/controller/DictBizController.java
+++ b/src/main/java/org/springblade/modules/system/controller/DictBizController.java
@@ -75,8 +75,8 @@
 	})
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "列表", notes = "传入dict")
-	public R<List<DictBizVO>> list(@ApiIgnore @RequestParam Map<String, Object> dict) {
-		List<DictBiz> list = dictService.list(Condition.getQueryWrapper(dict, DictBiz.class).lambda().orderByAsc(DictBiz::getSort));
+	public R<List<DictBizVO>> list(@ApiIgnore DictBiz dict) {
+		List<DictBiz> list = dictService.list(Condition.getQueryWrapper(dict).lambda().orderByAsc(DictBiz::getSort));
 		return R.data(DictBizWrapper.build().listNodeVO(list));
 	}
 
diff --git a/src/main/java/org/springblade/modules/system/controller/LogErrorController.java b/src/main/java/org/springblade/modules/system/controller/LogErrorController.java
index d659ae4..8819a32 100644
--- a/src/main/java/org/springblade/modules/system/controller/LogErrorController.java
+++ b/src/main/java/org/springblade/modules/system/controller/LogErrorController.java
@@ -60,8 +60,8 @@
 	 * 查询多条(分页)
 	 */
 	@GetMapping("/list")
-	public R<IPage<LogError>> list(@ApiIgnore @RequestParam Map<String, Object> logError, Query query) {
-		IPage<LogError> pages = errorLogService.page(Condition.getPage(query.setDescs("create_time")), Condition.getQueryWrapper(logError, LogError.class));
+	public R<IPage<LogError>> list(@ApiIgnore LogError logError, Query query) {
+		IPage<LogError> pages = errorLogService.page(Condition.getPage(query.setDescs("create_time")), Condition.getQueryWrapper(logError));
 		return R.data(pages);
 	}
 
diff --git a/src/main/java/org/springblade/modules/system/controller/LogUsualController.java b/src/main/java/org/springblade/modules/system/controller/LogUsualController.java
index 5898eed..a105677 100644
--- a/src/main/java/org/springblade/modules/system/controller/LogUsualController.java
+++ b/src/main/java/org/springblade/modules/system/controller/LogUsualController.java
@@ -60,8 +60,8 @@
 	 * 查询多条(分页)
 	 */
 	@GetMapping("/list")
-	public R<IPage<LogUsual>> list(@ApiIgnore @RequestParam Map<String, Object> log, Query query) {
-		IPage<LogUsual> pages = logService.page(Condition.getPage(query), Condition.getQueryWrapper(log, LogUsual.class));
+	public R<IPage<LogUsual>> list(@ApiIgnore LogUsual log, Query query) {
+		IPage<LogUsual> pages = logService.page(Condition.getPage(query), Condition.getQueryWrapper(log));
 		return R.data(pages);
 	}
 
diff --git a/src/main/java/org/springblade/modules/system/controller/MenuController.java b/src/main/java/org/springblade/modules/system/controller/MenuController.java
index 45b18b4..13b85a8 100644
--- a/src/main/java/org/springblade/modules/system/controller/MenuController.java
+++ b/src/main/java/org/springblade/modules/system/controller/MenuController.java
@@ -128,8 +128,8 @@
 //	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "菜单列表", notes = "传入menu")
-	public R<List<MenuVO>> menuList(@ApiIgnore @RequestParam Map<String, Object> menu) {
-		List<Menu> list = menuService.list(Condition.getQueryWrapper(menu, Menu.class).lambda().eq(Menu::getCategory, 1).orderByAsc(Menu::getSort));
+	public R<List<MenuVO>> menuList(@ApiIgnore Menu menu) {
+		List<Menu> list = menuService.list(Condition.getQueryWrapper(menu).lambda().eq(Menu::getCategory, 1).orderByAsc(Menu::getSort));
 		return R.data(MenuWrapper.build().listNodeVO(list));
 	}
 
diff --git a/src/main/java/org/springblade/modules/system/controller/TenantController.java b/src/main/java/org/springblade/modules/system/controller/TenantController.java
index eb36712..33e9c94 100644
--- a/src/main/java/org/springblade/modules/system/controller/TenantController.java
+++ b/src/main/java/org/springblade/modules/system/controller/TenantController.java
@@ -93,8 +93,8 @@
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入tenant")
 	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
-	public R<IPage<Tenant>> list(@ApiIgnore @RequestParam Map<String, Object> tenant, Query query, BladeUser bladeUser) {
-		QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant, Tenant.class);
+	public R<IPage<Tenant>> list(@ApiIgnore Tenant tenant, Query query, BladeUser bladeUser) {
+		QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant);
 		IPage<Tenant> pages = tenantService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper);
 		return R.data(pages);
 	}
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 4b70511..da5ab3b 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -132,8 +132,8 @@
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "列表", notes = "传入account和realName")
 	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
-	public R<IPage<UserVO>> list(@ApiIgnore @RequestParam Map<String, Object> user, Query query, BladeUser bladeUser) {
-		QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
+	public R<IPage<UserVO>> list(@ApiIgnore User user, Query query, BladeUser bladeUser) {
+		QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user);
 		IPage<User> pages = userService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId()) : queryWrapper);
 		return R.data(UserWrapper.build().pageVO(pages));
 	}

--
Gitblit v1.9.3