Merge branch 'medal-mybatis' into 'master'

fix keyword为null检索到的勋章为空







See merge request !14

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/service/impl/MedalServiceImpl.java

@@ -64,6 +64,9 @@ public class MedalServiceImpl implements MedalService {
 
     @Override
     public List<Medal> findByKeyword(String word){
+        if (word==null){
+            word="";
+        }
         return medalMapper.findAll(word);
     }
 

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/ctrl/IntegralController.java

@@ -49,7 +49,7 @@ public class IntegralController extends BaseController{
 
     @RequestMapping(value = UrlConstants.API_MEDAL,method = RequestMethod.GET)
     public List<MedalDTO> getIntegrals(@RequestParam(value = "userId")Long userId,
-                                       @RequestParam(value = "keyword")String keyword,
+                                       @RequestParam(value = "keyword",required = false)String keyword,
                                        HttpServletRequest request){
         return medalLogic.getMedals(keyword,userId);
     }