From 42546a6330b658fb7625908c51af5c8e6c7b4dde Mon Sep 17 00:00:00 2001
From: Koda <koda.masaru3@gmail.com>
Date: Mon, 30 Oct 2017 21:50:18 +0900
Subject: [PATCH] #929 Display creator of search condition

---
 .../knowledge/control/open/KnowledgeControl.java |  5 ++++-
 .../project/knowledge/dao/ExUsersDao.java        | 15 +++++++++++++++
 .../webapp/WEB-INF/views/open/knowledge/list.jsp | 16 +++++++++++++---
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
index 7d0173f4a..0ef38c737 100644
--- a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
+++ b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
@@ -22,6 +22,7 @@
 import org.support.project.knowledge.dao.CommentsDao;
 import org.support.project.knowledge.dao.DraftItemValuesDao;
 import org.support.project.knowledge.dao.ExGroupsDao;
+import org.support.project.knowledge.dao.ExUsersDao;
 import org.support.project.knowledge.dao.KnowledgeHistoriesDao;
 import org.support.project.knowledge.dao.KnowledgeItemValuesDao;
 import org.support.project.knowledge.dao.KnowledgesDao;
@@ -528,10 +529,12 @@ public Boundary list() throws Exception {
                 if (StringUtils.isNotEmpty(creators)) {
                     String[] creatorsArray = creators.split(",");
                     for (String userName : creatorsArray) {
-                        List<UsersEntity> users = UserLogic.get().getUser(userName.trim(), offset, 20);
+                        List<UsersEntity> users = ExUsersDao.get().selectByUserName(userName);
                         creatorUserEntities.addAll(users);
                     }
                 }
+                setAttribute("creators", creatorUserEntities);
+                
                 knowledges.addAll(knowledgeLogic.searchKnowledge(keyword, tags, groups, creatorUserEntities, templates, loginedUser, offset * PAGE_LIMIT, PAGE_LIMIT));
             }
     
diff --git a/src/main/java/org/support/project/knowledge/dao/ExUsersDao.java b/src/main/java/org/support/project/knowledge/dao/ExUsersDao.java
index 82f4d1dac..0493244df 100644
--- a/src/main/java/org/support/project/knowledge/dao/ExUsersDao.java
+++ b/src/main/java/org/support/project/knowledge/dao/ExUsersDao.java
@@ -78,5 +78,20 @@ public AccountInfo selectAccountInfoOnKey(Integer userId) {
 
         return info;
     }
+    
+    /**
+     * ユーザ名でユーザの情報を取得
+     * 同姓同名も存在しうるため、リストで返す
+     * @param userName
+     * @return
+     */
+    public List<UsersEntity> selectByUserName(String userName) {
+        String sql = "SELECT * FROM USERS WHERE USER_NAME = ?";
+        List<UsersEntity> users = executeQueryList(sql, UsersEntity.class, userName);
+        for (UsersEntity usersEntity : users) {
+            usersEntity.setPassword(""); // パスワードはクリア
+        }
+        return users;
+    }
 
 }
diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/list.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/list.jsp
index 5d5a4bf3e..4a852d626 100644
--- a/src/main/webapp/WEB-INF/views/open/knowledge/list.jsp
+++ b/src/main/webapp/WEB-INF/views/open/knowledge/list.jsp
@@ -64,7 +64,7 @@
 
         <!-- Filter -->
         <c:if
-            test="${!empty selectedTag || !empty selectedGroup || !empty selectedUser || !empty selectedTags || !empty selectedGroups || !empty keyword || !empty types}">
+            test="${!empty selectedTag || !empty selectedGroup || !empty selectedUser || !empty selectedTags || !empty selectedGroups || !empty keyword || !empty types || !empty creators }">
             <div class="row">
                 <div class="col-sm-12 selected_tag">
 
@@ -103,6 +103,15 @@
                             </a>
                         </c:forEach>
                     </c:if>
+                    
+                    <c:if test="${!empty creators}">
+                        <c:forEach var="creator" items="${creators}" varStatus="status">
+                            <a class="text-link" href="<%=request.getContextPath()%>/open.knowledge/list?creators=<%=jspUtil.out("creator.userName")%>">
+                                <i class="fa fa-pencil"></i>&nbsp;<%=jspUtil.out("creator.userName")%>
+                            </a>
+                        </c:forEach>
+                    </c:if>
+                    
 
                     <c:if test="${!empty selectedGroups}">
                         <c:forEach var="group" items="${selectedGroups}" varStatus="status">
@@ -164,7 +173,7 @@
             </div>
         </c:if>
         
-
+        <c:if test="${empty types}">
         <div class="row">
             <div class="col-sm-12">
                 <form role="form" action="<%=request.getContextPath()%>/open.knowledge/list">
@@ -199,10 +208,11 @@
                 <button class="btn btn-primary btn-xs" type="submit">
                     <i class="fa fa-search"></i>&nbsp;<%= jspUtil.label("label.apply") %>
                 </button>
-                </form>
                 </div>
+                </form>
             </div>
         </div>
+        </c:if>
 
         <!-- リスト -->
         <div class="row" id="knowledgeList">