diff --git a/src/main/java/com/bsd/cases/mapper/CaseCategoryMapper.java b/src/main/java/com/bsd/cases/mapper/CaseCategoryMapper.java index 05e2e44..2e6600c 100644 --- a/src/main/java/com/bsd/cases/mapper/CaseCategoryMapper.java +++ b/src/main/java/com/bsd/cases/mapper/CaseCategoryMapper.java @@ -2,6 +2,7 @@ package com.bsd.cases.mapper; import com.bsd.cases.model.CaseCategory; import com.bsd.cases.util.CommonMapper; +import com.bsd.cases.vo.CaseCategoryVo; import com.bsd.cases.vo.CaseContentBakVo; import com.bsd.cases.vo.CaseSearchVo; import org.apache.ibatis.annotations.Param; @@ -12,4 +13,6 @@ import java.util.List; @Repository public interface CaseCategoryMapper extends CommonMapper { List search(@Param("name") String name); + + List searchCaseCategoryVo(@Param("name") String name); } diff --git a/src/main/java/com/bsd/cases/service/CaseCategoryService.java b/src/main/java/com/bsd/cases/service/CaseCategoryService.java index cd826c7..a5bc090 100644 --- a/src/main/java/com/bsd/cases/service/CaseCategoryService.java +++ b/src/main/java/com/bsd/cases/service/CaseCategoryService.java @@ -3,6 +3,7 @@ package com.bsd.cases.service; import com.alibaba.fastjson.JSONObject; import com.bsd.cases.util.AjaxResult; import com.bsd.cases.util.PageAjax; +import com.bsd.cases.vo.CaseCategoryVo; import com.bsd.cases.vo.CaseContentBakVo; import java.util.List; @@ -60,5 +61,5 @@ public interface CaseCategoryService extends BaseService searchBakCategory(String name, Integer pageNum); + PageAjax searchBakCategory(String name, Integer pageNum); } diff --git a/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java b/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java index ff9a1a8..9d353e0 100644 --- a/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java +++ b/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java @@ -250,14 +250,14 @@ public class CaseCategoryServiceImpl extends BaseServiceImpl searchBakCategory(String name, Integer pageNum) { - Example example = new Example(CaseCategory.class); - Example.Criteria criteria = example.createCriteria(); - criteria.andEqualTo("state", Constants.STATE_VALID); - criteria.andLike("name", "%"+name+"%"); + public PageAjax searchBakCategory(String name, Integer pageNum) { +// Example example = new Example(CaseCategory.class); +// Example.Criteria criteria = example.createCriteria(); +// criteria.andEqualTo("state", Constants.STATE_VALID); +// criteria.andLike("name", "%"+name+"%"); PageHelper.startPage(pageNum, Constants.PAGE_SIZE); - List caseCategoryList = caseCategoryMapper.selectByExample(example); - PageAjax pageAjax = new PageAjax<>(caseCategoryList); + List caseCategoryList = caseCategoryMapper.searchCaseCategoryVo(name); + PageAjax pageAjax = new PageAjax<>(caseCategoryList); return pageAjax; } diff --git a/src/main/resources/mapper/CaseCategoryMapper.xml b/src/main/resources/mapper/CaseCategoryMapper.xml index 9ac7ddb..34197a0 100644 --- a/src/main/resources/mapper/CaseCategoryMapper.xml +++ b/src/main/resources/mapper/CaseCategoryMapper.xml @@ -7,4 +7,17 @@ SELECT id ,1 as type,content_title as `name`,url from case_content ) a WHERE a.`name` LIKE CONCAT('%',#{name},'%') + + diff --git a/src/main/resources/mapper/CaseContentMapper.xml b/src/main/resources/mapper/CaseContentMapper.xml index 1398d36..7317dc0 100644 --- a/src/main/resources/mapper/CaseContentMapper.xml +++ b/src/main/resources/mapper/CaseContentMapper.xml @@ -23,7 +23,7 @@ and a.category_id = #{level3Id} - a.`content_title` LIKE CONCAT('%',#{name},'%') + and a.`content_title` LIKE CONCAT('%',#{name},'%')