From e3aff986b7ddd7db1ce3ad024b6bd9edcd88b536 Mon Sep 17 00:00:00 2001
From: ck <851316342@qq.com>
Date: Wed, 23 Dec 2020 21:36:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CaseCategoryServiceImpl.java   | 17 +++++++++++------
 .../service/impl/CaseContentServiceImpl.java    |  7 +++++--
 2 files changed, 16 insertions(+), 8 deletions(-)

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 b70a2ea..0332d36 100644
--- a/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java
+++ b/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java
@@ -68,20 +68,25 @@ 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.setParentId(parentId);
+//            findCaseCategory.setState(Constants.STATE_VALID);
+            criteria.andEqualTo("parentId",parentId);
         }
-        List<CaseCategory> caseCategoryList = caseCategoryMapper.select(findCaseCategory);
+        List<CaseCategory> caseCategoryList = caseCategoryMapper.selectByExample(example);
         JSONObject pageJson = PageUtils.page(caseCategoryList,pageNum,pageSize);
         JSONArray jsonArray = pageJson.getJSONArray("list");
         caseCategoryList = JSONObject.parseArray(JSONObject.toJSONString(jsonArray), CaseCategory.class);
diff --git a/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java b/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java
index 69f5f0f..7c0b882 100644
--- a/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java
+++ b/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java
@@ -8,6 +8,7 @@ import com.bsd.cases.model.*;
 import com.bsd.cases.service.CaseContentService;
 import com.bsd.cases.service.CaseUsersService;
 import com.bsd.cases.util.AjaxResult;
+import com.bsd.cases.util.LogUtils;
 import com.bsd.cases.util.PageAjax;
 import com.bsd.cases.util.PageUtils;
 import com.bsd.cases.vo.CaseContentBakVo;
@@ -16,6 +17,7 @@ import com.bsd.cases.vo.CaseContentDetailVo;
 import com.bsd.cases.vo.CaseContentVo;
 import com.github.pagehelper.PageHelper;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -50,7 +52,7 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
     private CaseContentScoreMapper caseContentScoreMapper;
     @Resource
     private CaseContentForwardMapper caseContentForwardMapper;
-
+    private Logger logger = LogUtils.getPlatformLogger();
     /**
      * 获取文章列表
      *
@@ -190,7 +192,8 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
         Long contentId = jsonObject.getLong("contentId");
         JSONArray contentAttachmentJson = jsonObject.getJSONArray("contentAttachmentJson");
         JSONArray contentMaterialJson = jsonObject.getJSONArray("contentMaterialJson");
-
+        logger.info("CKTEST"+ jsonObject.toJSONString());
+        System.out.println("CKTEST"+ jsonObject.toJSONString());
         if (null == contentId) {
             //新增
             if (StringUtils.isBlank(contentTitle)) {