|
|
@ -105,11 +105,12 @@ public class CmsColumnController extends JeecgController<CmsColumn, ICmsColumnSe |
|
|
|
CmsColumn.setPid("0"); |
|
|
|
CmsColumn.setPid("0"); |
|
|
|
} |
|
|
|
} |
|
|
|
Result<IPage<CmsColumn>> result = new Result<>(); |
|
|
|
Result<IPage<CmsColumn>> result = new Result<>(); |
|
|
|
QueryWrapper<CmsColumn> queryWrapper = QueryGenerator.initQueryWrapper(CmsColumn, req.getParameterMap()); |
|
|
|
QueryWrapper<CmsColumn> queryWrapper = new QueryWrapper<>();// QueryGenerator.initQueryWrapper(CmsColumn, req.getParameterMap());
|
|
|
|
String name = CmsColumn.getName(); |
|
|
|
String name = CmsColumn.getName(); |
|
|
|
if (StringUtils.isBlank(name)) { |
|
|
|
if (StringUtils.isBlank(name)) { |
|
|
|
queryWrapper.eq("pid", CmsColumn.getPid()); |
|
|
|
queryWrapper.eq("pid", CmsColumn.getPid()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
queryWrapper.orderBy(true, true, "sort"); |
|
|
|
Page<CmsColumn> page = new Page<CmsColumn>(pageNo, pageSize); |
|
|
|
Page<CmsColumn> page = new Page<CmsColumn>(pageNo, pageSize); |
|
|
|
IPage<CmsColumn> pageList = cmsColumnService.page(page, queryWrapper); |
|
|
|
IPage<CmsColumn> pageList = cmsColumnService.page(page, queryWrapper); |
|
|
|
result.setSuccess(true); |
|
|
|
result.setSuccess(true); |
|
|
@ -189,9 +190,12 @@ public class CmsColumnController extends JeecgController<CmsColumn, ICmsColumnSe |
|
|
|
//@AutoLog(value = "基础能力设置-获取子数据")
|
|
|
|
//@AutoLog(value = "基础能力设置-获取子数据")
|
|
|
|
@ApiOperation(value = "基础能力设置-获取子数据", notes = "基础能力设置-获取子数据") |
|
|
|
@ApiOperation(value = "基础能力设置-获取子数据", notes = "基础能力设置-获取子数据") |
|
|
|
@GetMapping(value = "/childList") |
|
|
|
@GetMapping(value = "/childList") |
|
|
|
public Result<List<CmsColumn>> queryPageList(CmsColumn CmsColumn, HttpServletRequest req) { |
|
|
|
public Result<List<CmsColumn>> queryPageList(CmsColumn cmsColumn, HttpServletRequest req) { |
|
|
|
Result<List<CmsColumn>> result = new Result(); |
|
|
|
Result<List<CmsColumn>> result = new Result(); |
|
|
|
QueryWrapper<CmsColumn> queryWrapper = QueryGenerator.initQueryWrapper(CmsColumn, req.getParameterMap()); |
|
|
|
// QueryWrapper<CmsColumn> queryWrapper = QueryGenerator.initQueryWrapper(CmsColumn, req.getParameterMap());
|
|
|
|
|
|
|
|
QueryWrapper<CmsColumn> queryWrapper = new QueryWrapper<>(); |
|
|
|
|
|
|
|
queryWrapper.eq("pid", cmsColumn.getPid()); |
|
|
|
|
|
|
|
queryWrapper.orderBy(true, true, "sort"); |
|
|
|
List<CmsColumn> list = cmsColumnService.list(queryWrapper); |
|
|
|
List<CmsColumn> list = cmsColumnService.list(queryWrapper); |
|
|
|
result.setSuccess(true); |
|
|
|
result.setSuccess(true); |
|
|
|
result.setResult(list); |
|
|
|
result.setResult(list); |
|
|
@ -213,6 +217,7 @@ public class CmsColumnController extends JeecgController<CmsColumn, ICmsColumnSe |
|
|
|
QueryWrapper<CmsColumn> queryWrapper = new QueryWrapper<>(); |
|
|
|
QueryWrapper<CmsColumn> queryWrapper = new QueryWrapper<>(); |
|
|
|
List<String> parentIdList = Arrays.asList(parentIds.split(",")); |
|
|
|
List<String> parentIdList = Arrays.asList(parentIds.split(",")); |
|
|
|
queryWrapper.in("pid", parentIdList); |
|
|
|
queryWrapper.in("pid", parentIdList); |
|
|
|
|
|
|
|
queryWrapper.orderBy(true, true, "sort"); |
|
|
|
List<CmsColumn> list = cmsColumnService.list(queryWrapper); |
|
|
|
List<CmsColumn> list = cmsColumnService.list(queryWrapper); |
|
|
|
IPage<CmsColumn> pageList = new Page<>(1, 10, list.size()); |
|
|
|
IPage<CmsColumn> pageList = new Page<>(1, 10, list.size()); |
|
|
|
pageList.setRecords(list); |
|
|
|
pageList.setRecords(list); |
|
|
|