From 06d67427cade642c65c3b822d74c69600f79bac9 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 25 Jan 2022 10:23:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tag/controller/OnlCgformAreaController.java  |  4 ++--
 .../tag/service/IOnlCgformAreaService.java       |  3 +--
 .../service/impl/OnlCgformAreaServiceImpl.java   | 16 +++++++++-------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java
index 35e4befd1..227a4c8d5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java
@@ -67,8 +67,8 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
 	@AutoLog(value = "区域管理表-列表查询")
 	@ApiOperation(value="区域管理表-列表查询", notes="区域管理表-列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<OnlCgformArea>> queryList(String isModel,int sort){
-		list = onlCgformAreaService.queryList(isModel,sort);
+	public Result<List<OnlCgformArea>> queryList(OnlCgformArea onlCgformArea){
+		List<OnlCgformArea> list = onlCgformAreaService.queryList(onlCgformArea);
 		return Result.OK(list);
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java
index 10a6bb5a7..1cb4f7ed7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java
@@ -57,7 +57,6 @@ public interface IOnlCgformAreaService extends IService<OnlCgformArea> {
 	 *
 	 * @return
 	 */
-    List<OnlCgformArea> queryList(String isModel);
+    List<OnlCgformArea> queryList(OnlCgformArea onlCgformArea);
 
-	List<OnlCgformArea> queryList(String isModel, int sort);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java
index b000a6af6..b08a062e0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java
@@ -1,9 +1,11 @@
 package com.jero.modules.tag.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.modules.tag.entity.OnlCgformArea;
 import com.jero.modules.tag.mapper.OnlCgformAreaMapper;
 import com.jero.modules.tag.service.IOnlCgformAreaService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -84,12 +86,12 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl<OnlCgformAreaMapper, O
 	 * @return
 	 */
 	@Override
-    public List<OnlCgformArea> queryList(String isModel) {
-        return list();
+    public List<OnlCgformArea> queryList(OnlCgformArea onlCgformArea) {
+		LambdaQueryWrapper<OnlCgformArea> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		if(StringUtils.isNotBlank(onlCgformArea.getIsModel())){
+			lambdaQueryWrapper.eq(OnlCgformArea::getIsModel,onlCgformArea.getIsModel())
+					.orderByAsc(OnlCgformArea::getSort);
+		}
+		return list(lambdaQueryWrapper);
     }
-
-	@Override
-	public List<OnlCgformArea> queryList(String isModel, int sort) {
-		return null;
-	}
 }