diff --git a/jian/src/main/java/com/springboot/jian/controller/returnBook.java b/jian/src/main/java/com/springboot/jian/controller/returnBook.java index 6769dd0..4ed9a9e 100644 --- a/jian/src/main/java/com/springboot/jian/controller/returnBook.java +++ b/jian/src/main/java/com/springboot/jian/controller/returnBook.java @@ -17,24 +17,34 @@ public int returnBook( @RequestParam String user ) throws IOException { int result = 0; + boolean bookMessage = false; + boolean userMessage = false; returnBookMessage returnBookMessage = new returnBookMessage(); - selectAllBookMessage selectAllBookMessage = new selectAllBookMessage(); selectAllUserMessage selectAllUserMessage = new selectAllUserMessage(); // 判断图书是否存在 - for (int i = 0; i < selectAllBookMessage.selectAllBook().size(); i++) { - if (selectAllBookMessage.selectAllBook().get(i) == book) { -// 判断用户是否存在 - for (int j = 0; j < selectAllUserMessage.selectAllUser().size(); j++) { - if (selectAllUserMessage.selectAllUser().get(j) == user) { - result = returnBookMessage.returnBook(book, user); - } else { - result = -2; - } - } - } else { - result = -1; + for (int i = 0; i < com.springboot.jian.service.selectAllBookMessage.selectAllBook().size(); i++) { + if (com.springboot.jian.service.selectAllBookMessage.selectAllBook().get(i).equals(book)) { + bookMessage = true; + break; } } +// 判断用户是否存在 + for (int j = 0; j < selectAllUserMessage.selectAllUser().size(); j++) { + if (selectAllUserMessage.selectAllUser().get(j).equals(user)) { + result = returnBookMessage.returnBook(book, user); + userMessage = true; + break; + } + } + if (!bookMessage) { + result = -1; + } + if (!userMessage) { + result = -2; + } + if (bookMessage && userMessage) { + result = 1; + } return result; } }