diff --git a/src/main/java/com/lovenav/service/serviceImpl/QRCServiceImpl.java b/src/main/java/com/lovenav/service/serviceImpl/QRCServiceImpl.java
index 559f085..c0108a9 100644
--- a/src/main/java/com/lovenav/service/serviceImpl/QRCServiceImpl.java
+++ b/src/main/java/com/lovenav/service/serviceImpl/QRCServiceImpl.java
@@ -25,54 +25,64 @@ public class QRCServiceImpl implements QRCService{
         String logoPath = "src/main/resources/static/logo/NAV.png";
         String destPath = "src/main/resources/static/qr";
 
-//        通过collect的url_id查找网址id对应网址
         UrlList urlList = urlListDao.selectByPrimaryKey(Long.valueOf(collect.getUrl_id()));
+        String url = urlList.getUrl();
         List<CollectIconList> list = collectIconListDao.selectByUrlid(collect.getUrl_id());
-//        如果表中没有可以插入
-        if (list.size() == 0) {
-//            url的icon
-            if(QRCodeUtil.notBase64(collect.getIcon_url())){
-
-                String icon_url = QRCodeUtil.downloadPicture(collect.getIcon_url());
-                collect.setIcon_url(icon_url);
-
-//              将网址生成二维码并返回本地路径
-                String url = urlList.getUrl();
-                String url_wait = QRCodeUtil.encode(url, logoPath, destPath, true);
-                collect.setQr_url(url_wait);
-                String base64 = QRCodeUtil.ImageToBase64(url_wait);
-                collectIconListDao.insert(collect);
-                return JSON.toJSONString(base64);
-            }
-//            空的icon
-            else if(collect.getIcon_url() == null){
-                collect.setIcon_url(null);
-
-//              将网址生成二维码并返回本地路径
-                String url = urlList.getUrl();
-                String url_wait = QRCodeUtil.encode(url, logoPath, destPath, true);
-                collect.setQr_url(url_wait);
-                String base64 = QRCodeUtil.ImageToBase64(url_wait);
-                collectIconListDao.insert(collect);
-                return JSON.toJSONString(base64);
-            }
-//            base64的icon
-            else {
-                String base64str = QRCodeUtil.delete_profix(collect.getIcon_url());
-                String icon_url = QRCodeUtil.GenerateImage(base64str,"src/main/resources/static/icon");
-                collect.setIcon_url(icon_url);
-
-                String url = urlList.getUrl();
-                String url_wait = QRCodeUtil.encode(url, logoPath, destPath, true);
-                collect.setQr_url(url_wait);
-
-                String base64 = QRCodeUtil.ImageToBase64(url_wait);
-                collectIconListDao.insert(collect);
-                return JSON.toJSONString(base64);
-            }
-        } else {
-            return JSON.toJSONString(QRCodeUtil.ImageToBase64(list.get(0).getQr_url()));
+        if (list.size() == 0 && collect.getUrl_id()!=null) {
+            String base64 = QRCodeUtil.ImageToBase64(QRCodeUtil.encode(url, logoPath, destPath, true););
+            collect.setQr_url(base64);
+            collectIconListDao.insert(collect);
+            return JSON.toJSONString(base64);
         }
+//
+////        通过collect的url_id查找网址id对应网址
+//        UrlList urlList = urlListDao.selectByPrimaryKey(Long.valueOf(collect.getUrl_id()));
+//        List<CollectIconList> list = collectIconListDao.selectByUrlid(collect.getUrl_id());
+////        如果表中没有可以插入
+//        if (list.size() == 0) {
+////            url的icon
+//            if(QRCodeUtil.notBase64(collect.getIcon_url())){
+//
+//                String icon_url = QRCodeUtil.downloadPicture(collect.getIcon_url());
+//                collect.setIcon_url(icon_url);
+//
+////              将网址生成二维码并返回本地路径
+//                String url = urlList.getUrl();
+//                String url_wait = QRCodeUtil.encode(url, logoPath, destPath, true);
+//                collect.setQr_url(url_wait);
+//                String base64 = QRCodeUtil.ImageToBase64(url_wait);
+//                collectIconListDao.insert(collect);
+//                return JSON.toJSONString(base64);
+//            }
+////            空的icon
+//            else if(collect.getIcon_url() == null){
+//                collect.setIcon_url(null);
+//
+////              将网址生成二维码并返回本地路径
+//                String url = urlList.getUrl();
+//                String url_wait = QRCodeUtil.encode(url, logoPath, destPath, true);
+//                collect.setQr_url(url_wait);
+//                String base64 = QRCodeUtil.ImageToBase64(url_wait);
+//                collectIconListDao.insert(collect);
+//                return JSON.toJSONString(base64);
+//            }
+////            base64的icon
+//            else {
+//                String base64str = QRCodeUtil.delete_profix(collect.getIcon_url());
+//                String icon_url = QRCodeUtil.GenerateImage(base64str,"src/main/resources/static/icon");
+//                collect.setIcon_url(icon_url);
+//
+//                String url = urlList.getUrl();
+//                String url_wait = QRCodeUtil.encode(url, logoPath, destPath, true);
+//                collect.setQr_url(url_wait);
+//
+//                String base64 = QRCodeUtil.ImageToBase64(url_wait);
+//                collectIconListDao.insert(collect);
+//                return JSON.toJSONString(base64);
+//            }
+//        } else {
+//            return JSON.toJSONString(QRCodeUtil.ImageToBase64(list.get(0).getQr_url()));
+//        }
     }
 
 ////        通过传入collect的url_id查找相同网址图片列表