From 40375ace7220f84dbbe39657eb71af9d46f27159 Mon Sep 17 00:00:00 2001
From: Saturneric <eric.bktu@gmail.com>
Date: Tue, 1 Sep 2020 15:02:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ase/repository/activity/ActivityRepository.java       | 4 +++-
 src/main/java/com/codesdream/ase/service/UserService.java | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/codesdream/ase/repository/activity/ActivityRepository.java b/src/main/java/com/codesdream/ase/repository/activity/ActivityRepository.java
index aa5ea5b..4220280 100644
--- a/src/main/java/com/codesdream/ase/repository/activity/ActivityRepository.java
+++ b/src/main/java/com/codesdream/ase/repository/activity/ActivityRepository.java
@@ -14,7 +14,9 @@ import java.util.Optional;
 @Repository
 public interface ActivityRepository extends JpaRepository<Activity, Integer> {
 
-    Optional<Activity> findByTitle(String Title);
+    Optional<Activity> findActivityByTitleAndType(String title,String type);
+
+    Optional<Activity> findActivityByTitle(String title);
 
     Optional<Activity> findByCreator(String creatorName);
 
diff --git a/src/main/java/com/codesdream/ase/service/UserService.java b/src/main/java/com/codesdream/ase/service/UserService.java
index 29b70fa..698a54e 100644
--- a/src/main/java/com/codesdream/ase/service/UserService.java
+++ b/src/main/java/com/codesdream/ase/service/UserService.java
@@ -20,16 +20,16 @@ import java.util.*;
 @Service
 public class UserService implements IUserService {
     @Resource
-    UserFunctionsListGenerator userFunctionsListGenerator;
+    private UserFunctionsListGenerator userFunctionsListGenerator;
 
     @Resource
-    UserRepository userRepository;
+    private UserRepository userRepository;
 
     @Resource
-    ASEPasswordEncoder passwordEncoder;
+    private ASEPasswordEncoder passwordEncoder;
 
     @Resource
-    ASEUsernameEncoder usernameEncoder;
+    private ASEUsernameEncoder usernameEncoder;
 
     @Override
     public List<User> findAll() {