From 83211c92f077324b0928ad33030af1655c0500a5 Mon Sep 17 00:00:00 2001
From: liuwx_gitee <22247537@qq.com>
Date: Sun, 12 Mar 2023 18:55:57 +0800
Subject: [PATCH] bug fix

---
 .../jeecg/modules/KM/service/IKmDocService.java |  4 +++-
 .../KM/service/impl/KmDocServiceImpl.java       | 17 ++++++++++++++++-
 .../KM/service/impl/KmEsMgntServiceImpl.java    |  3 +++
 .../controller/SysCategoryController.java       |  8 +++++---
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/IKmDocService.java b/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/IKmDocService.java
index 9479d67..c8e65de 100644
--- a/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/IKmDocService.java
+++ b/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/IKmDocService.java
@@ -23,7 +23,7 @@ public interface IKmDocService extends IService<KmDoc> {
 
     //首页最新发布文档列表
     Page<KmDocVO> queryPublicPageList(Page<KmDocVO> page, KmDocParamVO kmDocParamVO,String orderBy);
-    
+
     void convertDocSync(KmDoc doc);
 
     void indexDocSync(KmDoc doc);
@@ -58,4 +58,6 @@ public interface IKmDocService extends IService<KmDoc> {
     Result<?> deleteDoc(String docId,HttpServletRequest req);
 
     KmDocEsVO getEsDocByDocId(String indexId);
+
+    void initESIndex();
 }
diff --git a/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/impl/KmDocServiceImpl.java b/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/impl/KmDocServiceImpl.java
index 190230f..4fce467 100644
--- a/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/impl/KmDocServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/impl/KmDocServiceImpl.java
@@ -44,7 +44,6 @@ import org.jeecg.common.system.vo.KmSearchResultObjVO;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.CommonUtils;
 import org.jeecg.common.util.DateUtils;
-import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.UUIDGenerator;
 import org.jeecg.modules.KM.VO.*;
 import org.jeecg.modules.KM.common.config.BaseConfig;
@@ -1656,4 +1655,20 @@ public class KmDocServiceImpl extends ServiceImpl<KmDocMapper, KmDoc> implements
         return  kmDocMapper.queryKmDocStatistics(page,statisticsType,dbType);
     }
 
+    @Override
+    public void initESIndex(){
+        KmDocEsVO kmEsVO = new KmDocEsVO();
+        kmEsVO.setTitle("for init");
+        kmEsVO.setDocId("1");
+        Result<?> result = saveDocToEs(kmEsVO, "");
+        if (result.isSuccess()) {
+            String indexId = (String) result.getResult();
+            if (indexId != null && !indexId.isEmpty()) {
+                Result<?> result1 = deleteDocFromEs(indexId);
+                if (result1.isSuccess()) {
+                    log.info("init index success!");
+                }
+            }
+        }
+    }
 }
diff --git a/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/impl/KmEsMgntServiceImpl.java b/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/impl/KmEsMgntServiceImpl.java
index be554cf..fd90427 100644
--- a/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/impl/KmEsMgntServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/impl/KmEsMgntServiceImpl.java
@@ -24,6 +24,8 @@ public class KmEsMgntServiceImpl  implements IKmEsMgntService {
 
     @Autowired
     private RestHighLevelClient restHighLevelClient;
+    @Autowired
+    private IKmDocService docService;
 
 
     private  boolean checkTemplateExists(String templateName)throws IOException {
@@ -42,6 +44,7 @@ public class KmEsMgntServiceImpl  implements IKmEsMgntService {
                 log.error(result.getMessage());
                 return result;
             }
+            docService.initESIndex();
         }
         if(!checkTemplateExists(KMConstant.KMSearchRecordIndexName)){
             result = initKmSearchRecordTemplate();
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java
index 6cf0211..25a1200 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java
@@ -123,9 +123,11 @@ public class SysCategoryController {
 	public Result<?> add(@RequestBody SysCategory sysCategory) {
 		Result<SysCategory> result = new Result<SysCategory>();
 		try {
-			if(oConvertUtils.isNotEmpty(sysCategory.getPid()) && !sysCategory.getPid().equals("0") &&
-					sysCategory.getRecommend() != null
-					&& sysCategory.getRecommend() == true)
+			if(sysCategory.getPid() != null
+					&& oConvertUtils.isNotEmpty(sysCategory.getPid())
+					&& !sysCategory.getPid().equals("0")
+					&& sysCategory.getRecommend() != null
+					&& sysCategory.getRecommend())
 				return Result.error("只允许推荐根节点的专题");
 
 			sysCategoryService.addSysCategory(sysCategory);