Merge remote-tracking branch 'origin/master'

src/main/java/com/zzsn/knowbase/controller/KnowledgeController.java

@@ -28,10 +28,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 
 /**
@@ -74,6 +71,7 @@ public class KnowledgeController {
      */
     @GetMapping(value = "/getById")
     public Result<?> getById(@RequestParam String id)  {
+        log.info("{}===query begin",new Date());
         KnowledgeVO knowledgeVO=knowledgeService.getById(id);
         if(null!=knowledgeVO.getPublishDate()&&(!knowledgeVO.getPublishDate().isEmpty())){
             knowledgeVO.setPublishDate(EsDateUtil.esFieldDateMapping(knowledgeVO.getPublishDate()));

src/main/java/com/zzsn/knowbase/service/impl/KnowledgeServiceImpl.java

@@ -90,6 +90,10 @@ class KnowledgeServiceImpl implements IKnowledgeService {
             knowledge.setVerifyStatus(0);
         }
         knowledge.setCreateTime(cn.hutool.core.date.DateUtil.formatDateTime(new Date()).replace(" ", "T"));
+        if(null==knowledge.getPublishDate()){
+            knowledge.setPublishDate(cn.hutool.core.date.DateUtil.formatDateTime(new Date()).replace(" ", "T"));
+        }
+
         knowledge.setDeleteFlag(0);
         KnowledgeMessage knowledgeMessage = new KnowledgeMessage();
         if (Integer.valueOf("0").equals(knowledge.getImportData())) {