diff --git a/src/com/hellogithub/service/UserService.java b/src/com/hellogithub/service/UserService.java index ce78fdc..5164b5a 100644 --- a/src/com/hellogithub/service/UserService.java +++ b/src/com/hellogithub/service/UserService.java @@ -45,8 +45,16 @@ public class UserService { * @param name * */ public List selectLabel(String name){ - String []stringList; - stringList=userDao.selectLabel(name).split(";"); + String [] stringList; + String label = userDao.selectLabel(name); + if(label == null ) + { + stringList="无搜索历史".split(";"); + } + else{ + stringList=userDao.selectLabel(name).split(";"); + } + return Arrays.asList(stringList); } /** diff --git a/src/com/hellogithub/servlet/selectUserLabelServlet.java b/src/com/hellogithub/servlet/selectUserLabelServlet.java index f7b8b87..c091bee 100644 --- a/src/com/hellogithub/servlet/selectUserLabelServlet.java +++ b/src/com/hellogithub/servlet/selectUserLabelServlet.java @@ -10,6 +10,8 @@ import jakarta.servlet.http.*; import java.io.IOException; import java.io.PrintWriter; import java.util.HashMap; +import java.util.List; + @WebServlet("/selectUserLabel") public class selectUserLabelServlet extends HttpServlet { private UserService userService = new UserService(); @@ -35,14 +37,22 @@ public class selectUserLabelServlet extends HttpServlet { PrintWriter writer = resp.getWriter(); HttpSession session = req.getSession(); userEntity userEntity=(userEntity)session.getAttribute("user"); + String jsonString = null; if(userEntity == null){ setResultError("用户暂未登录", writer); }else{ String name = userEntity.getUserName(); - String jsonString = JSONObject.toJSONString(userService.selectLabel(name)); - writer.println(jsonString); + List stringList = userService.selectLabel(name); + if(stringList.get(0).equals("无搜索历史")){ + writer.println(jsonString); + } + else{ + jsonString = JSONObject.toJSONString(stringList); + writer.println(jsonString); + } + } -// setResultOK("success",writer); + writer.close(); } diff --git a/src/com/hellogithub/servlet/userDetailServlet.java b/src/com/hellogithub/servlet/userDetailServlet.java index 09fbbee..98bca3b 100644 --- a/src/com/hellogithub/servlet/userDetailServlet.java +++ b/src/com/hellogithub/servlet/userDetailServlet.java @@ -60,6 +60,7 @@ public class userDetailServlet extends HttpServlet { dataMap.put("project",projectService.retProjectByUserId(id)); jsonString = JSONObject.toJSONString(dataMap); writer.println(jsonString); + writer.close(); } }