fix: ranking filter

shuoj · Nov 19, 2019 · f10a9d6 · f10a9d6
1 parent 4537f38
commit f10a9d6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -132,6 +132,12 @@
             <artifactId>sentry-logback</artifactId>
             <version>1.7.27</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>28.1-jre</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/src/main/java/cn/kastner/oj/service/impl/ContestServiceImpl.java b/src/main/java/cn/kastner/oj/service/impl/ContestServiceImpl.java
@@ -17,6 +17,7 @@
 import cn.kastner.oj.service.ContestService;
 import cn.kastner.oj.util.CommonUtil;
 import cn.kastner.oj.util.DTOMapper;
+import com.google.common.base.Strings;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -596,11 +597,11 @@ public RankingDTO getRanking(String id, RankingQuery query) throws ContestExcept
                 redisTemplate.opsForValue().get("timeCostList:" + rankingUserDTO.getId()));
       }
       if (null != rankingUserList && !rankingUserList.isEmpty()) {
-        if (null != query.getGroupId()) {
+        if (!Strings.isNullOrEmpty(query.getGroupId())) {
           rankingUserList = rankingUserList.stream().filter(
               rankingUserDTO -> query.getGroupId().equals(rankingUserDTO.getGroupId())
           ).collect(Collectors.toList());
-        } else if (null != query.getTeacherId()) {
+        } else if (!Strings.isNullOrEmpty(query.getTeacherId())) {
           rankingUserList = rankingUserList.stream().filter(
               rankingUserDTO -> query.getTeacherId().equals(rankingUserDTO.getTeacherId())
           ).collect(Collectors.toList());
@@ -627,11 +628,11 @@ public RankingDTO getRanking(String id, RankingQuery query) throws ContestExcept
 
   private Set<RankingUser> filterWithQuery(
       Set<RankingUser> rankingUserList, RankingQuery query) {
-    if (null != query.getGroupId()) {
+    if (!Strings.isNullOrEmpty(query.getGroupId())) {
       return rankingUserList.stream().filter(
           rankingUserDTO -> query.getGroupId().equals(rankingUserDTO.getGroupId())
       ).collect(Collectors.toSet());
-    } else if (null != query.getTeacherId()) {
+    } else if (!Strings.isNullOrEmpty(query.getTeacherId())) {
       return rankingUserList.stream().filter(
           rankingUserDTO -> query.getTeacherId().equals(rankingUserDTO.getTeacherId())
       ).collect(Collectors.toSet());