diff --git a/src/com/hellogithub/entity/articleEntity.java b/src/com/hellogithub/entity/articleEntity.java
index 73e9cca..799378c 100644
--- a/src/com/hellogithub/entity/articleEntity.java
+++ b/src/com/hellogithub/entity/articleEntity.java
@@ -76,4 +76,5 @@ public class articleEntity {
     public int getReadCount(){return readCount;}
 
     public void setReadCount(int readCount){this.readCount = readCount;}
+
 }
diff --git a/src/com/hellogithub/service/articleService.java b/src/com/hellogithub/service/articleService.java
index 3381e50..405899f 100644
--- a/src/com/hellogithub/service/articleService.java
+++ b/src/com/hellogithub/service/articleService.java
@@ -1,22 +1,64 @@
 package com.hellogithub.service;
 
+import com.alibaba.fastjson.JSONObject;
+import com.hellogithub.dao.UserDao;
 import com.hellogithub.dao.articleDao;
 import com.hellogithub.entity.articleEntity;
 
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class articleService {
-    public articleService(){
-
-    }
     private articleDao articleDao = new articleDao();
-    public List<articleEntity> ArticleSortBylast(){
-        return articleDao.ArticleSortBylast();
+    private UserDao userDao = new UserDao();
+    public String ArticleSortBylast(){
+        List<articleEntity> articleEntityList =articleDao.ArticleSortBylast();
+        List<articleEntity> articleEntityList1=new ArrayList<>();
+        Map<String,Object> dataMap;
+        Map<String,Map<String,Object>> dataMap1  = new HashMap<>();
+        for(int i=0;i<articleEntityList.size();i++)
+        {
+            dataMap = new HashMap<>();
+            articleEntity articleEntity = articleEntityList.get(i);
+            int id = articleEntity.getUserId();
+            String username = userDao.selectNameById(id);
+            dataMap.put("ArticleContent",articleEntity.getArticleContent());
+            dataMap.put("ArticleId",articleEntity.getArticleId());
+            dataMap.put("ArticleTitle",articleEntity.getArticleTitle());
+            dataMap.put("IsValid",articleEntity.getIsValid());
+            dataMap.put("ReadCount",articleEntity.getReadCount());
+            dataMap.put("username",username);
+            dataMap1.put(i+"", dataMap);
+            articleEntityList1.add(articleEntity);
+        }
+        return JSONObject.toJSONString(dataMap1);
     }
 
-    public List<articleEntity> ArticleSortByhot(){
-        return articleDao.ArticleSortByhot();
+    public String ArticleSortByhot(){
+
+        List<articleEntity> articleEntityList =articleDao.ArticleSortByhot();
+        List<articleEntity> articleEntityList1=new ArrayList<>();
+        Map<String,Object> dataMap;
+        Map<String,Map<String,Object>> dataMap1  = new HashMap<>();
+        for(int i=0;i<articleEntityList.size();i++)
+        {
+            dataMap = new HashMap<>();
+            articleEntity articleEntity = articleEntityList.get(i);
+            int id = articleEntity.getUserId();
+            String username = userDao.selectNameById(id);
+            dataMap.put("ArticleContent",articleEntity.getArticleContent());
+            dataMap.put("ArticleId",articleEntity.getArticleId());
+            dataMap.put("ArticleTitle",articleEntity.getArticleTitle());
+            dataMap.put("IsValid",articleEntity.getIsValid());
+            dataMap.put("ReadCount",articleEntity.getReadCount());
+            dataMap.put("username",username);
+            dataMap1.put(i+"", dataMap);
+            articleEntityList1.add(articleEntity);
+        }
+        return JSONObject.toJSONString(dataMap1);
     }
 
     public articleEntity selectByArticleId(int id){
diff --git a/src/com/hellogithub/servlet/article/articleSortServlet.java b/src/com/hellogithub/servlet/article/articleSortServlet.java
index 4dc16c8..1098802 100644
--- a/src/com/hellogithub/servlet/article/articleSortServlet.java
+++ b/src/com/hellogithub/servlet/article/articleSortServlet.java
@@ -41,15 +41,11 @@ public class articleSortServlet extends HttpServlet {
 
 //        传入参数?sort_by = last 或者?sort_by = hot  默认是last界面
         PrintWriter writer = resp.getWriter();
-        List<articleEntity> articleEntityListLast = articleservice.ArticleSortBylast();
-        List<articleEntity> articleEntityListHot = articleservice.ArticleSortByhot();
         String sortby = req.getParameter("sort_by");
-        String jsonString1 = JSONObject.toJSONString(articleEntityListLast);
-        String jsonString2 = JSONObject.toJSONString(articleEntityListHot);
         if ("last".equals(sortby)) {
-            writer.println(jsonString1);
+            writer.println(articleservice.ArticleSortBylast());
         }else if("hot".equals(sortby)){
-            writer.println(jsonString2);
+            writer.println(articleservice.ArticleSortByhot());
         }else{
             setResultError("false", writer);
         }