From 1d2d21ebe6db951201f812cb53414efc8ff638ad Mon Sep 17 00:00:00 2001
From: wangzhijiang <1358525938@qq.com>
Date: Thu, 8 Jun 2023 09:27:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF-=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83-=E7=9F=A5=E8=AF=86=E5=88=86=E4=BA=AB-?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=88=9B=E5=BB=BA=E4=BA=BA=E3=80=81=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/phone/controller/SearchCenterController.java | 1 -
 .../modules/phone/service/impl/SearchCenterServiceImpl.java   | 4 ++--
 .../service/impl/ProblemKnowledgeBaseEOServiceImpl.java       | 2 ++
 .../searchcenter/service/impl/DocumentSearchServiceImpl.java  | 3 +++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/controller/SearchCenterController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/controller/SearchCenterController.java
index e9ca79ce8..5ab87d0b2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/controller/SearchCenterController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/controller/SearchCenterController.java
@@ -16,7 +16,6 @@ import java.util.Map;
 @Api(tags = "手机端-搜索中心")
 @RestController
 @RequestMapping("/phone/search")
-@Slf4j
 public class SearchCenterController {
 
     @Autowired
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/SearchCenterServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/SearchCenterServiceImpl.java
index 4a33a1afb..3245ff4d5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/SearchCenterServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/SearchCenterServiceImpl.java
@@ -16,12 +16,12 @@ import com.jero.modules.report.service.ILawsMonthlyReportManageEOService;
 import com.jero.modules.system.service.ISysUserService;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
 import java.util.Map;
 
-@Component
+@Service
 public class SearchCenterServiceImpl implements ISearchCenterService {
 
     @Autowired
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
index 85b905b73..2492789ec 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
@@ -129,6 +129,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 			problemKnowledgeBaseEO.setReleaseUserId(currentUser.getId());
 			problemKnowledgeBaseEO.setReleaseTime(now);
+			problemKnowledgeBaseEO.setCreateBy(currentUser.getUsername());
 			this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
 		}
 		save(problemKnowledgeBaseEO);
@@ -428,6 +429,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 			convertAfterMap.put("standard_title",problemKnowledgeBaseEO.getStandTitle());
 			convertAfterMap.put("content",problemKnowledgeBaseEO.getContent());
 			convertAfterMap.put("create_time",new Date());
+			convertAfterMap.put("create_by",problemKnowledgeBaseEO.getCreateBy());
 			convertAfterMap.put("show_permissions",problemKnowledgeBaseEO.getShowPermissions());
 		}
 	}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
index 03e90bafc..33ebc1c40 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
@@ -12,6 +12,7 @@ import com.jero.common.constant.enums.ModuleEnum;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.es.JeroElasticsearchTemplate;
 import com.jero.common.system.vo.LoginUser;
+import com.jero.common.util.DateUtils;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
 import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
 import com.jero.modules.collection.entity.OnlCgformCollection;
@@ -1442,6 +1443,8 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
                     mapSource.put("content","");
                 }*/
             }
+            Long create_time = (Long) mapSource.get("create_time");
+            mapSource.put("create_time_str",DateUtils.formatTime(create_time));
             mapList.add(mapSource);
         }