diff --git a/src/main/java/com/lovenav/controller/AttachmentController.java b/src/main/java/com/lovenav/controller/AttachmentController.java index b398620..1786dc0 100644 --- a/src/main/java/com/lovenav/controller/AttachmentController.java +++ b/src/main/java/com/lovenav/controller/AttachmentController.java @@ -51,7 +51,7 @@ public class AttachmentController { map.put("msg",configService.addConfig(config)); map.put("code",200); }else { - out.println(config1.getValue()); +// out.println(config1.getValue()); configService.updateConfig(config1); map=attachmentService.updateFile(multipartFile,cate,config1); } @@ -79,8 +79,8 @@ public class AttachmentController { return new ResponseEntity(bytes1, headers, HttpStatus.OK); } String fileUrl=attachment.getPath()+attachment.getFileName()+attachment.getSuffix(); - out.println(fileUrl); - out.println(attachment.getSuffix().replace(".","")); +// out.println(fileUrl); +// out.println(attachment.getSuffix().replace(".","")); File file = new File(fileUrl); FileInputStream inputStream = new FileInputStream(file); byte[] bytes = new byte[inputStream.available()]; diff --git a/src/main/java/com/lovenav/controller/UrlListController.java b/src/main/java/com/lovenav/controller/UrlListController.java index 32c80eb..fe4d961 100644 --- a/src/main/java/com/lovenav/controller/UrlListController.java +++ b/src/main/java/com/lovenav/controller/UrlListController.java @@ -136,6 +136,11 @@ public class UrlListController { } List ss=new ArrayList<>(); ss= (List) urlCateListService.countAllCateByUser(urlCateList).get("cateNum"); + if (ss.size()==0){ + map.put("cateNum", "0"); + map.put("urlListNum","0"); + return map; + } map.put("cateNum", String.valueOf(ss.size())); map.put("urlListNum", String.valueOf(urlListService.countUrlListByUserId(ss))); return map; diff --git a/src/main/java/com/lovenav/controller/UserController.java b/src/main/java/com/lovenav/controller/UserController.java index 8930d5c..29e9d14 100644 --- a/src/main/java/com/lovenav/controller/UserController.java +++ b/src/main/java/com/lovenav/controller/UserController.java @@ -176,9 +176,8 @@ public class UserController { return map; } - if (user1 != null) { - int result=userService.updatePassword(user1); + int result=userService.updatePassword(user); if(result==1){ map.put("Data",user1.getUserLogin()); map.put("Data",user1.getUserEmail());