chenxz 7 роки тому
батько
коміт
d728dfad85

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

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

+ 3 - 1
mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/logic/impl/MedalLogicImpl.java

@@ -77,7 +77,9 @@ public class MedalLogicImpl extends BaseLogic implements MedalLogic {
         List<Medal> medals=medalService.findByKeyword(keyword);
         return medals.parallelStream().map(medal -> {
             MedalDTO medalDTO=medalwrapper.wrap(medal);
-            medalDTO.setCaughted(medalService.findByUserIdAndMedalId(userId, medal.getId())!=null?true:false);
+            if (userId!=null) {
+                medalDTO.setCaughted(medalService.findByUserIdAndMedalId(userId, medal.getId()) != null ? true : false);
+            }
             return medalDTO;
         }).collect(Collectors.toList());
     }