From bf0b68397e03918df362a16d9386d10c3810f3a4 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 21 Aug 2023 17:52:34 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tag/controller/LawsAreaController.java      |  4 ++--
 .../tag/controller/LawsTagController.java       | 17 ++++++++---------
 .../tag/service/impl/ILawsTagServiceImpl.java   |  5 ++---
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/LawsAreaController.java b/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/LawsAreaController.java
index e51d2e0e..fe60788d 100644
--- a/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/LawsAreaController.java
+++ b/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/LawsAreaController.java
@@ -155,7 +155,7 @@ public class LawsAreaController extends JeroController<LawsArea, ILawsAreaServic
 	 */
 	@AutoLog(value = "区域管理表-通过id删除")
 	@ApiOperation(value="区域管理表-通过id删除", notes="区域管理表-通过id删除")
-	@GetMapping(value = "/delete")
+	@PostMapping(value = "/delete")
 	@RequiresPermissions("area:delete")
 	public Result<?> delete(@RequestBody Map<String, String> map) {
 		if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
@@ -184,7 +184,7 @@ public class LawsAreaController extends JeroController<LawsArea, ILawsAreaServic
 	 */
 	@AutoLog(value = "区域管理表-批量删除")
 	@ApiOperation(value="区域管理表-批量删除", notes="区域管理表-批量删除")
-	@GetMapping(value = "/deleteBatch")
+	@PostMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestBody Map<String, String> map) {
 		if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){
 			return Result.error("请选择数据!");
diff --git a/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java b/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java
index 2875c55f..c6f82a40 100644
--- a/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java
+++ b/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java
@@ -56,11 +56,10 @@ public class LawsTagController extends JeroController<LawsTag, ILawsTagService>
 	@ApiOperation(value="标签管理-分页列表查询", notes="标签管理-分页列表查询")
 	@RequiresPermissions("tag:page")
 	@GetMapping(value = "/page")
-	public Result<?> queryPageList(@RequestBody LawsTag lawsTag,
+	public Result<?> queryPageList(LawsTag lawsTag,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-
 		IPage<LawsTag> pageList= lawsTagService.queryPageList(lawsTag, pageNo, pageSize, req);
 		return Result.OK(pageList);
 	}
@@ -70,13 +69,13 @@ public class LawsTagController extends JeroController<LawsTag, ILawsTagService>
 	 *
 	 * @return
 	 */
-	@AutoLog(value = "标签管理-列表查询")
-	@ApiOperation(value="标签管理-列表查询", notes="标签管理-列表查询")
-	@GetMapping(value = "/list")
-	public Result<List<LawsTag>> queryList(LawsArea lawsArea) {
-		List<LawsTag> list = lawsTagService.queryList(lawsArea);
-		return Result.OK(list);
-	}
+	//@AutoLog(value = "标签管理-列表查询")
+	//@ApiOperation(value="标签管理-列表查询", notes="标签管理-列表查询")
+	//@GetMapping(value = "/list")
+	//public Result<List<LawsTag>> queryList(LawsArea lawsArea) {
+	//	List<LawsTag> list = lawsTagService.queryList(lawsArea);
+	//	return Result.OK(list);
+	//}
 
 	/**
 	 *   添加
diff --git a/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java b/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java
index 5675a0e1..5aefb6ab 100644
--- a/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java
+++ b/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java
@@ -317,9 +317,8 @@ public class ILawsTagServiceImpl extends ServiceImpl<LawsTagMapper, LawsTag> imp
 	 */
 	@Override
 	public List<LawsTag> queryList(LawsArea lawsArea) {
-		UpdateWrapper<LawsTag> updateWrapper=new UpdateWrapper<>();
-		updateWrapper.set("area_id", lawsArea.getId());
-		updateWrapper.set("is_model", lawsArea.getIsModel());
+		QueryWrapper<LawsTag> updateWrapper=new QueryWrapper<>();
+		updateWrapper.eq("is_model", lawsArea.getIsModel());
 		return list(updateWrapper);
 	}