|
@@ -44,19 +44,27 @@ public class TagInfoController {
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "/treeList", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/treeList", method = RequestMethod.GET)
|
|
- public Result<IPage<TagInfo>> list(@RequestParam(defaultValue = "10")Integer pageSize,@RequestParam(defaultValue = "1")Integer pageNo) {
|
|
|
|
|
|
+ public Result<IPage<TagInfo>> list(@RequestParam (required = false)String tagName,@RequestParam(defaultValue = "10")Integer pageSize,@RequestParam(defaultValue = "1")Integer pageNo,@RequestParam(required = false)Long tagCategoryId,@RequestParam(defaultValue = "1")Integer level) {
|
|
Result<IPage<TagInfo>> result = new Result<>();
|
|
Result<IPage<TagInfo>> result = new Result<>();
|
|
try {
|
|
try {
|
|
- QueryWrapper<TagInfo> query = new QueryWrapper<>();
|
|
|
|
|
|
+ QueryWrapper<TagInfo> query = new QueryWrapper<>();
|
|
query.eq("del_flag", CommonConstant.DEL_FLAG_0);
|
|
query.eq("del_flag", CommonConstant.DEL_FLAG_0);
|
|
- query.eq("level",1);
|
|
|
|
|
|
+ if(null!=level){
|
|
|
|
+ query.eq("level",level);
|
|
|
|
+ }
|
|
|
|
+ if(null!=tagCategoryId){
|
|
|
|
+ query.eq("tag_category_id",tagCategoryId);
|
|
|
|
+ }
|
|
|
|
+ if(null!=tagName&&!"".equals(tagName)){
|
|
|
|
+ query.like("tag_name",tagName);
|
|
|
|
+ }
|
|
query.orderByAsc("tag_order");
|
|
query.orderByAsc("tag_order");
|
|
Page<TagInfo> page = new Page<>(pageNo, pageSize);
|
|
Page<TagInfo> page = new Page<>(pageNo, pageSize);
|
|
IPage<TagInfo> pageList = tagInfoService.page(page,query);
|
|
IPage<TagInfo> pageList = tagInfoService.page(page,query);
|
|
List<TagInfo>recordsLevel1 = pageList.getRecords();
|
|
List<TagInfo>recordsLevel1 = pageList.getRecords();
|
|
|
|
|
|
- List<TagInfo>setRecordsLevel1 = new ArrayList<>();
|
|
|
|
- if(null!=recordsLevel1&&!recordsLevel1.isEmpty()){
|
|
|
|
|
|
+ List<TagInfo>setRecordsLevel1 = new ArrayList<>();
|
|
|
|
+ if(null!=recordsLevel1&&!recordsLevel1.isEmpty()){
|
|
for (TagInfo level1tag:recordsLevel1) {
|
|
for (TagInfo level1tag:recordsLevel1) {
|
|
if(!level1tag.isLeaf()){
|
|
if(!level1tag.isLeaf()){
|
|
//非叶子节点
|
|
//非叶子节点
|