WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

文档库--解决冲突

Browse Source
This commit is contained in:
zhn
2022-01-25 10:23:25 +08:00
parent b1d1c9d9d6
commit 06d67427ca
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java
+2 -2
View File
@@ -67,8 +67,8 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
@AutoLog(value = "区域管理表-列表查询") @AutoLog(value = "区域管理表-列表查询")
@ApiOperation(value="区域管理表-列表查询", notes="区域管理表-列表查询") @ApiOperation(value="区域管理表-列表查询", notes="区域管理表-列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<List<OnlCgformArea>> queryList(String isModel,int sort){ public Result<List<OnlCgformArea>> queryList(OnlCgformArea onlCgformArea){
list = onlCgformAreaService.queryList(isModel,sort); List<OnlCgformArea> list = onlCgformAreaService.queryList(onlCgformArea);
return Result.OK(list); return Result.OK(list);
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java
+1 -2
View File
@@ -57,7 +57,6 @@ public interface IOnlCgformAreaService extends IService<OnlCgformArea> {
* *
* @return * @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
+9 -7
View File
@@ -1,9 +1,11 @@
package com.jero.modules.tag.service.impl; 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.entity.OnlCgformArea;
import com.jero.modules.tag.mapper.OnlCgformAreaMapper; import com.jero.modules.tag.mapper.OnlCgformAreaMapper;
import com.jero.modules.tag.service.IOnlCgformAreaService; import com.jero.modules.tag.service.IOnlCgformAreaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Date; import java.util.Date;
@@ -84,12 +86,12 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl<OnlCgformAreaMapper, O
* @return * @return
*/ */
@Override @Override
public List<OnlCgformArea> queryList(String isModel) { public List<OnlCgformArea> queryList(OnlCgformArea onlCgformArea) {
return list(); 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;
}
} }