文档库--解决冲突

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);
 	}
 

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);
 }

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;
-	}
 }