MOD: fuzzy search

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/rpc/user/UserService.java

@@ -57,5 +57,5 @@ public interface UserService {
      */
     UserDTO save(UserDTO userDTO);
 
-    List<UserDTO> getUserByFuzzyName(UserDTO userDTO);
+    List<UserDTO> getUserByFuzzySearch(UserDTO userDTO);
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/rpc/user/impl/UserServiceImpl.java

@@ -50,7 +50,7 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public List<UserDTO> getUserByFuzzyName(UserDTO userDTO) {
-        return userService.getUserByFuzzyName(userDTO);
+    public List<UserDTO> getUserByFuzzySearch(UserDTO userDTO) {
+        return userService.getUserByFuzzySearch(userDTO);
     }
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/impl/UserRPCServiceImpl.java

@@ -159,19 +159,16 @@ public class UserRPCServiceImpl implements UserService {
     @Override
     public Page<UserDTOForMT> getUserOfFuzzySearch(Map<String, String> condition, Pageable pageable) {
         List<UserDTOForMT> userDTOForMTs = new ArrayList<>();
+        UserDTO userDTO =  new UserDTO();
         if (condition.get("email") != null) {
-            UserDTO userDTO = userService.getUserByEmail(condition.get("email"));
-            userDTOForMTs.add(Converter.convert(UserDTOForMT.class, userDTO));
-        } else if (condition.get("mobile") != null) {
-            UserDTO userDTO = userService.getUserByMobile(condition.get("mobiel"));
-            userDTOForMTs.add(Converter.convert(UserDTOForMT.class, userDTO));
+            userDTO.setName(condition.get("email"));
+
         } else if (condition.get("name") != null) {
-            UserDTO userDTO = new UserDTO();
             userDTO.setName(condition.get("name"));
-            List<UserDTO> userDTOs = userService.getUserByFuzzyName(userDTO);
-            for (UserDTO uD: userDTOs){
-                userDTOForMTs.add(Converter.convert(UserDTOForMT.class, uD));
-            }
+    }
+        List<UserDTO> userDTOs = userService.getUserByFuzzySearch(userDTO);
+        for (UserDTO uD : userDTOs) {
+            userDTOForMTs.add(Converter.convert(UserDTOForMT.class, uD));
         }
 
         int activePage = pageable.getPageNumber();