up

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<CaseCategory> {
     List<CaseSearchVo> search(@Param("name") String name);
+
+    List<CaseCategoryVo> searchCaseCategoryVo(@Param("name") String name);
 }

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<CaseCategory> extends BaseService<CaseCateg
      * @param pageNum
      * @return
      */
-    PageAjax<com.bsd.cases.model.CaseCategory> searchBakCategory(String name, Integer pageNum);
+    PageAjax<CaseCategoryVo> searchBakCategory(String name, Integer pageNum);
 }

src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java

@@ -250,14 +250,14 @@ public class CaseCategoryServiceImpl extends BaseServiceImpl<CaseCategoryMapper,
     }
 
     @Override
-    public PageAjax<CaseCategory> 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<CaseCategoryVo> 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<CaseCategory> caseCategoryList = caseCategoryMapper.selectByExample(example);
-        PageAjax<CaseCategory> pageAjax = new PageAjax<>(caseCategoryList);
+        List<CaseCategoryVo> caseCategoryList = caseCategoryMapper.searchCaseCategoryVo(name);
+        PageAjax<CaseCategoryVo> pageAjax = new PageAjax<>(caseCategoryList);
         return pageAjax;
     }
 

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},'%')
     </select>
+
+    <select id="searchCaseCategoryVo" resultType="com.bsd.cases.vo.CaseCategoryVo">
+        select ccy.id,ccy.name,ccy.level,ccy.parent_id,ccy2.name as parent_name,ccy.url,ccy.create_date_time,ccy.update_date_time,
+        ccy.create_by,ccy.update_by,ccy.state
+        FROM case_category ccy
+        left join case_category ccy2
+        on ccy.parent_id = ccy2.id
+        where
+        1 = 1 and ccy.state = 1
+        <if test="name != null and name != ''">
+          and  ccy.`name` LIKE CONCAT('%',#{name},'%')
+        </if>
+    </select>
 </mapper>

src/main/resources/mapper/CaseContentMapper.xml

@@ -23,7 +23,7 @@
             and a.category_id = #{level3Id}
         </if>
         <if test="name != null and name != ''">
-            a.`content_title` LIKE CONCAT('%',#{name},'%')
+           and a.`content_title` LIKE CONCAT('%',#{name},'%')
         </if>
     </select>
 </mapper>