问题修改

src/main/java/com/zzsn/leaderbase/service/EsServer.java

@@ -48,7 +48,7 @@ public class EsServer {
     public Result<?> getCharacterBaike(String uid, String name){
 
         //参数校验
-        if(uid == null || uid.length() == 0 || name == null || name.length() == 0)
+        if((uid == null || uid.length() == 0) && (name == null || name.length() == 0))
             return Result.OK("未查询到人物详情信息", null);
 
         UserServerCharacterVo vo = esUtil.getCharacterBaike(USERSERVER_CHARACTER, uid, name, UserServerCharacterVo.class);
@@ -61,7 +61,7 @@ public class EsServer {
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         MultiMatchQueryBuilder multiMatchQueryBuilder = QueryBuilders.multiMatchQuery(relatedReportsVo.getKeyword(),  "title", "content", "summary");
         searchSourceBuilder.query(multiMatchQueryBuilder);
-        searchSourceBuilder.sort("publishDate", SortOrder.DESC);
+        //searchSourceBuilder.sort("publishDate", SortOrder.DESC);//如果按发布时间排序，则会出现排在最前面的信息和关键词相关度不高
         //高亮
         //HighlightBuilder highlightBuilder = new HighlightBuilder();
 

src/main/java/com/zzsn/leaderbase/service/impl/CharacterInfoServiceImpl.java

@@ -475,7 +475,6 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
         BeanUtils.copyProperties(characterVo, characterChangeInfo);
         characterChangeInfo.setId(newId);
         characterChangeInfo.setUid(vo.getUid());
-        characterChangeInfo.setUid(vo.getName());
         characterChangeInfo.setCheckResult(1L);
         characterChangeInfo.setStatus(2L);
         characterChangeInfoService.save(characterChangeInfo);

src/main/java/com/zzsn/leaderbase/util/EsUtil.java

@@ -721,9 +721,11 @@ public class EsUtil {
             searchSourceBuilder.size(1);
             searchSourceBuilder.sort("createDate", SortOrder.DESC);
 
-            BoolQueryBuilder boolQuery = QueryBuilders.boolQuery()
-                    .must(QueryBuilders.matchQuery("uid",uid))
-                    .must(QueryBuilders.matchQuery("name",name));
+            BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
+            if(uid != null && uid.length() > 0)
+                boolQuery.must(QueryBuilders.matchQuery("uid",uid));
+            if(name != null && name.length() >0)
+                boolQuery.must(QueryBuilders.matchQuery("name",name));
 
             searchSourceBuilder.query(boolQuery);
             searchRequest.source(searchSourceBuilder);

src/main/resources/mapper/CharacterBasicInfoMapper.xml

@@ -23,7 +23,7 @@
             ) d
         on d.character_uid = a.uid
         where 1 = 1
-        and (b.status != 0 or b.status IS NULL)
+        and (b.status = 1 or b.status IS NULL)
         <if test="name != null and name != ''">
             AND a.name = #{name}
         </if>
@@ -60,7 +60,7 @@
         INNER JOIN character_change_info b
         on a.id = b.id
         where 1 = 1
-        and (b.status != 0 or b.status IS NULL)
+        and (b.status = 1 or b.status IS NULL)
         <if test="name != null and name != ''">
             AND a.name = #{name}
         </if>