diff --git a/src/main/java/com/lovenav/controller/UrlAndCateController.java b/src/main/java/com/lovenav/controller/UrlAndCateController.java
index d4a41e6..e7f1f7f 100644
--- a/src/main/java/com/lovenav/controller/UrlAndCateController.java
+++ b/src/main/java/com/lovenav/controller/UrlAndCateController.java
@@ -102,85 +102,62 @@ public class UrlAndCateController {
     {
         List<UrlCateList> urlCateLists = urlCateListService.selectUrListByUserId(Integer.valueOf(userId));
         List<UrlList> urlLists = urlListService.selectUrList();
-
         List<CateAndUrl> cateAndUrlList = new ArrayList<>();
-
-
-
-
-        //预处理为CateAndUrl对象
-        for( int i = 0 ; i < urlCateLists.size() ; i++)
-        {
+        for (UrlCateList urlCateList  : urlCateLists) {
             CateAndUrl cateAndUrl = new CateAndUrl();
             cateAndUrl.setFloder("true");
-            cateAndUrl.setName(urlCateLists.get(i).getName());
-            cateAndUrl.setParentId(urlCateLists.get(i).getRootCateId());
-            cateAndUrl.setCateId(urlCateLists.get(i).getId());
+            cateAndUrl.setName(urlCateList.getName());
+            cateAndUrl.setParentId(urlCateList.getRootCateId());
+            cateAndUrl.setCateId(urlCateList.getId());
             cateAndUrlList.add(cateAndUrl);
-
         }
-        for( int i = 0 ; i < urlLists.size() ; i++)
-        {
-            CateAndUrl cateAndUrl = new CateAndUrl();
-            cateAndUrl.setFloder("false");
-            cateAndUrl.setName(urlLists.get(i).getName());
-            cateAndUrl.setParentId(urlLists.get(i).getCateId());
-            cateAndUrl.setUrlId(urlLists.get(i).getId());
-            cateAndUrlList.add(cateAndUrl);
-
-        }
-
-        List<CateAndUrl> parentsList = new ArrayList<>();
-        //声明返回集合
-        List<CateAndUrl> resultList = new ArrayList<>();
-        //对全部数据进行遍历
-        for (CateAndUrl disease : cateAndUrlList) {
-            //判断是否是第一梯队，或者说是树的根节点，如果是根节点就加入到父类集合与返回集合
-            if (disease.getParentId() == 0) {
-                parentsList.add(disease);
-                resultList.add(disease);
-            } else {
-                //对于不是第一梯队的数据进行遍历
-                for (CateAndUrl parent : parentsList) {
-                    //对数据的pid与父类集合中的父节点进行配对，如果配对成功，就把数据加入到父节点中的子节点集合
-
-                    if (parent.getFloder().equals("true") ) {
-                        if( parent.getCateId() == disease.getParentId())
-                        {
-                            parent.getChildUC().add(disease);
-                            //当前数据有可能是别的数据的父节点，加到父类容器
-                            parentsList.add(disease);
-                            break;
-                        }
-
-                    }
-                    if (parent.getFloder().equals("false") ) {
-                        if(parent.getUrlId() == disease.getParentId())
-                        {
-                            parent.getChildUC().add(disease);
-                            //当前数据有可能是别的数据的父节点，加到父类容器
-                            parentsList.add(disease);
-                            break;
-                        }
-
-                    }
+        for( int i = 0 ; i < urlLists.size() ; i++){
+            UrlList urlList = urlLists.get(i);
+            for(CateAndUrl cateAndUrl1 : cateAndUrlList) {
+                if (urlList.getCateId() == cateAndUrl1.getCateId())
+                {
+                    CateAndUrl cateAndUrl = new CateAndUrl();
+                    cateAndUrl.setFloder("false");
+                    cateAndUrl.setName(urlList.getName());
+                    cateAndUrl.setParentId(urlList.getCateId());
+                    cateAndUrl.setUrlId(urlList.getId());
+                    cateAndUrl.setUrl(urlList.getUrl());
+                    cateAndUrl.setIcon(urlList.getIcon());
+                    cateAndUrl.setCreatetime(urlList.getCreatetime());
+                    cateAndUrl.setViews(urlList.getViews());
+                    cateAndUrl.setTags(urlList.getTags());
+                    cateAndUrl.setWeigh(urlList.getWeigh());
+                    cateAndUrl.setStatus(urlList.getStatus());
+                    cateAndUrl.setDesc(urlList.getDesc());
+                    cateAndUrl.setNeedLogin(urlList.getNeedLogin());
+                    cateAndUrl.setAgentHint(urlList.getAgentHint());
+                    cateAndUrl.setIsNeedAgent(urlList.getIsNeedAgent());
+                    cateAndUrl.setIsAd(urlList.getIsAd());
+                    cateAndUrl.setIsTop(urlList.getIsTop());
+                    cateAndUrl.setIsEncrypt(urlList.getIsEncrypt());
+                    cateAndUrl1.getChildUC().add(cateAndUrl);
+                    break;
                 }
             }
-        }
 
+
+
+
+        }
         ObjectMapper mapper = new ObjectMapper();
-        String Json;
-        HashMap<String, Object> result = new HashMap<>();
-        // java对象转换为json字符换
+        String result = null;
         try {
-             Json =  mapper.writeValueAsString(resultList);
-            result.put("code", 200);
-            result.put("msg", "处理成功");
-            result.put("data", resultList);
+            HashMap<String, Object> data = new HashMap<>();
+            data.put("code", 200);
+            data.put("msg", "处理成功");
+            data.put("data", cateAndUrlList);
+            result = mapper.writeValueAsString(cateAndUrlList);
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }
-        return  JSONObject.toJSONString(result);
+
+        return result;
+
     }
 
     @RequestMapping("/disposeBookmarkExhibitedToJson")