Merge branch 'release_gdghg' of ssh://gitlab.gsstcloud.com:10022/poc/poc-api into release_gdghg

src/main/java/cn/com/poc/knowledge/query/KnowledgeInfosQuery.sql

@@ -13,10 +13,10 @@ select id,
        MODIFIER,
        MODIFIED_TIME
 from biz_knowledge_info
-where is_deleted = 'N' << and member_id = :memberId >>
-    << and knowledge_owner = : knowledgeOwner >>
+where is_deleted = 'N'
+    << and (member_id = :memberId or member_id = 1)>>
+    << and (knowledge_owner = :knowledgeOwner)>>
     << and LOCATE(:query ,knowledge_name) >>
     << and train_status = :trainStatus>>
     << and knowledge_type = :knowledgeType>>
-    or (member_id = 1 and is_deleted = 'N')
 order by MODIFIED_TIME

src/main/java/cn/com/poc/knowledge/query/KnowledgeInfosQueryItem.java

@@ -59,6 +59,20 @@ public class KnowledgeInfosQueryItem extends BaseItemClass implements Serializab
         this.knowledgeType = knowledgeType;
     }
 
+    /**
+     * knowledge_owner
+     * knowledge_owner
+     */
+    private String knowledgeOwner;
+
+    @Column(name = "knowledge_owner")
+    public String getKnowledgeOwner() {
+        return knowledgeOwner;
+    }
+
+    public void setKnowledgeOwner(String knowledgeOwner) {
+        this.knowledgeOwner = knowledgeOwner;
+    }
 
     /**
      * member_id