search by verifierName

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

@@ -82,9 +82,7 @@ public class KnowledgeController {
         return Result.OK(knowledgeVO);
     }
 
-    /**
-     * 分页列表查询
-     */
+
     @GetMapping(value = "/listFromPython")
     public Result<?> listFromPython(KnowledgeParam knowledgeParam,
                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -153,10 +151,6 @@ public class KnowledgeController {
          knowledgeService.deleteKnowledge(ids);
         return Result.OK("删除成功!");
     }
-
-    /**
-     * 文档解析
-     */
     @GetMapping(value = "/parse")
     public Result<?> parse(@RequestParam(name = "filePath") String filePath) throws IOException {
         String s = DocUtil.docParseHtml(filePath);

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

@@ -212,7 +212,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
         }
         //查看全部且是非管理员的时候
         List<String> knowPermitList = new ArrayList<>();
-        if ((!Integer.valueOf("0").equals(userInfo.getIsAll())) && (!knowledgeParam.getKnowledgeProjectId().equals("0"))) {
+        if (!Integer.valueOf("0").equals(userInfo.getIsAll())) {
             Map<String, Boolean> userKnowProjectSigns = authorizedUserService.getUserKnowProjectSigns(treeList, userInfo.getId());
             log.info("userKnowProjectSigns=={}", userKnowProjectSigns.toString());
             //all permit
@@ -221,7 +221,10 @@ class KnowledgeServiceImpl implements IKnowledgeService {
             List<String> halfPermitList = entries.stream().filter(item -> !item.getValue()).map(Map.Entry::getKey).collect(Collectors.toList());
             //know permit
             log.info("halfPermitList=={}", halfPermitList.toString());
-            knowPermitList = authorizedUserService.getUserPermissionKnowsByIds(halfPermitList, userInfo.getId());
+            if(!halfPermitList.isEmpty()){
+                knowPermitList = authorizedUserService.getUserPermissionKnowsByIds(halfPermitList, userInfo.getId());
+            }
+
             log.info("knowPermitList=={}", knowPermitList.toString());
             catList = allPermitList;
         } else {
@@ -310,7 +313,9 @@ class KnowledgeServiceImpl implements IKnowledgeService {
         if (StringUtils.isNotEmpty(knowledgeParam.getOrigin())) {
             boolQuery.must(QueryBuilders.matchPhraseQuery("origin", knowledgeParam.getOrigin()));
         }
-
+        if (StringUtils.isNotEmpty(knowledgeParam.getVerifierName())) {
+            boolQuery.must(QueryBuilders.matchPhraseQuery("verifierName", knowledgeParam.getVerifierName()));
+        }
         BoolQueryBuilder outer = new BoolQueryBuilder();
         if (!knowPermitList.isEmpty()) {