From 58f5380966525b15f8ea810dcd65a46200d3e0fe Mon Sep 17 00:00:00 2001
From: User_cyk <1020691186@qq.com>
Date: Sun, 2 Jul 2023 12:41:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=90=9C=E7=B4=A2=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/hellogithub/dao/UserDao.java                    | 5 +++--
 src/com/hellogithub/servlet/selectByInputServlet.java   | 6 ++++++
 src/com/hellogithub/servlet/selectUserLabelServlet.java | 5 ++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/com/hellogithub/dao/UserDao.java b/src/com/hellogithub/dao/UserDao.java
index 9e778f2..76ba452 100644
--- a/src/com/hellogithub/dao/UserDao.java
+++ b/src/com/hellogithub/dao/UserDao.java
@@ -139,12 +139,13 @@ public class UserDao {
      * */
     public String selectLabel(String name){
         String label;
+        userEntity userEntity1;
         try {
             Connection conn = JdbcUtils.getConnection();
             QueryRunner runner = new QueryRunner();
             String sql = "select searchHistory from user where userName=?";
-            label  = runner.query(conn, sql, new BeanHandler<>(String.class),name);
-
+            userEntity1  = runner.query(conn, sql, new BeanHandler<>(userEntity.class),name);
+            label=userEntity1.getSearchHistory();
         } catch (SQLException e) {
             throw new RuntimeException(e);
         }
diff --git a/src/com/hellogithub/servlet/selectByInputServlet.java b/src/com/hellogithub/servlet/selectByInputServlet.java
index 9ba9d87..9b7b131 100644
--- a/src/com/hellogithub/servlet/selectByInputServlet.java
+++ b/src/com/hellogithub/servlet/selectByInputServlet.java
@@ -50,7 +50,13 @@ public class selectByInputServlet extends HttpServlet {
         userEntity userEntity= null;
         userEntity=(userEntity)session.getAttribute("user");
         if(userEntity == null)
+        {
 
+        }
+        else{
+
+
+        }
 
 
         if(projectEntityList.size() == 0 ){
diff --git a/src/com/hellogithub/servlet/selectUserLabelServlet.java b/src/com/hellogithub/servlet/selectUserLabelServlet.java
index 9d78a3a..81584a6 100644
--- a/src/com/hellogithub/servlet/selectUserLabelServlet.java
+++ b/src/com/hellogithub/servlet/selectUserLabelServlet.java
@@ -1,6 +1,7 @@
 package com.hellogithub.servlet;
 
 import com.alibaba.fastjson.JSONObject;
+import com.hellogithub.entity.userEntity;
 import com.hellogithub.service.UserService;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.annotation.WebServlet;
@@ -32,7 +33,9 @@ public class selectUserLabelServlet extends HttpServlet {
 
         //返回所有的历史记录
         PrintWriter writer = resp.getWriter();
-        String name = req.getParameter("xxxxx");
+        HttpSession session = req.getSession();
+        userEntity userEntity=(userEntity)session.getAttribute("user");
+        String name = userEntity.getUserName();
         String jsonString = JSONObject.toJSONString(userService.selectLabel(name));
         writer.println(jsonString);
         setResultOK("success",writer);