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

@@ -68,25 +68,20 @@ public class CaseCategoryServiceImpl extends BaseServiceImpl<CaseCategoryMapper,
      */
     @Override
     public JSONObject getCaseCategoryByParentId(Long parentId,Integer pageNum,Integer pageSize) {
-//        CaseCategory findCaseCategory = new CaseCategory();
+        CaseCategory findCaseCategory = new CaseCategory();
-        Example example = new Example(CaseCategory.class);
-        example.setOrderByClause("update_date_time DESC");
-        Example.Criteria criteria = example.createCriteria();
-        criteria.andEqualTo("state",Constants.STATE_VALID);
         if (null == parentId){
             CaseCategory findCaseCategory2 = new CaseCategory();
             findCaseCategory2.setLevel(2);
             findCaseCategory2.setState(Constants.STATE_VALID);
             List<CaseCategory> caseCategoryList2 = caseCategoryMapper.select(findCaseCategory2);
-//            findCaseCategory.setState(Constants.STATE_VALID);
+            findCaseCategory.setState(Constants.STATE_VALID);
             parentId = caseCategoryList2.get(0).getId();
-//            findCaseCategory.setParentId(parentId);
+            findCaseCategory.setParentId(parentId);
-            criteria.andEqualTo("parentId",parentId);
         }else {
-//            findCaseCategory.setState(Constants.STATE_VALID);
+            findCaseCategory.setState(Constants.STATE_VALID);
-            criteria.andEqualTo("parentId",parentId);
+            findCaseCategory.setParentId(parentId);
         }
-        List<CaseCategory> caseCategoryList = caseCategoryMapper.selectByExample(example);
+        List<CaseCategory> caseCategoryList = caseCategoryMapper.select(findCaseCategory);
         JSONObject pageJson = PageUtils.page(caseCategoryList,pageNum,pageSize);
         JSONArray jsonArray = pageJson.getJSONArray("list");
         caseCategoryList = JSONObject.parseArray(JSONObject.toJSONString(jsonArray), CaseCategory.class);

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

@@ -52,7 +52,8 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
     private CaseContentScoreMapper caseContentScoreMapper;
     @Resource
     private CaseContentForwardMapper caseContentForwardMapper;
-    private Logger logger = LogUtils.getPlatformLogger();
+
+    private Logger logger = LogUtils.getBussinessLogger();
 
     /**
      * 获取文章列表
@@ -194,7 +195,8 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
         JSONArray contentAttachmentJson = jsonObject.getJSONArray("contentAttachmentJson");
         JSONArray contentMaterialJson = jsonObject.getJSONArray("contentMaterialJson");
         System.out.println("CKTEST"+jsonObject.toJSONString());
-        logger.info("CKTEST"+jsonObject.toJSONString());if (null == contentId) {
+        logger.info("CKTEST"+jsonObject.toJSONString());
+        if (null == contentId) {
             //新增
             if (StringUtils.isBlank(contentTitle)) {
                 ajaxResult.setRetcode(AjaxResult.FAILED);
@@ -415,4 +417,12 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
         }
         return ajaxResult;
     }
+
+    @Override
+    public AjaxResult getAllContentList() {
+        AjaxResult ajaxResult = new AjaxResult();
+        List<CaseContent> caseContentList = caseContentMapper.getAllContentList();
+        ajaxResult.setData(caseContentList);
+        return ajaxResult;
+    }
 }