1.增加一个levelJump里面的type类型判断

src/main/java/com/YuyeTech/TPlat/controller/LevelController.java

@@ -225,7 +225,7 @@ public class LevelController {
             List<Map> _unlockMapList = new ArrayList<>();
             //单人条件下判断上一关一个条件
             if (levelJump.getNumberType().equals(1)) {
-                List<LevelJump> levelJumpList = levelJumpService.findLevelJumpsByNumberType(levelJump.getNumberType(), Sort.Direction.ASC);
+                List<LevelJump> levelJumpList = levelJumpService.findLevelJumpsByNumberTypeAndType(levelJump.getNumberType(),levelJump.getType(), Sort.Direction.ASC);
                 for (int i = 0; i < levelJumpList.size(); i++) {
                     curLevelJump = levelJumpList.get(i);
                     if (curLevelJump.getId().equals(eventId)) {

src/main/java/com/YuyeTech/TPlat/repository/LevelJumpRepository.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @author:slambb
  * @date:2020/8/4
  */
-public interface LevelJumpRepository extends JpaRepository<LevelJump,Integer>{
+public interface LevelJumpRepository extends JpaRepository<LevelJump, Integer> {
 //    /**
 //     * In查询，根据参数列表顺序返回对象顺序
 //     * @param fcIdList
@@ -57,5 +57,5 @@ public interface LevelJumpRepository extends JpaRepository<LevelJump,Integer>{
 //
 //    Page<FcInfo> findAllByFcRankingShow(Integer rankingShow, Pageable pageable);
 
-      List<LevelJump> findAllByNumberType(Integer numberType, Sort sort);
+    List<LevelJump> findAllByNumberTypeAndType(Integer numberType, Integer type, Sort sort);
 }

src/main/java/com/YuyeTech/TPlat/service/LevelJumpService.java

@@ -17,7 +17,7 @@ import java.util.Map;
  */
 public interface LevelJumpService {
 
-    List<LevelJump> findLevelJumpsByNumberType(Integer numberType, Sort.Direction direction);
+    List<LevelJump> findLevelJumpsByNumberTypeAndType(Integer numberType, Integer type, Sort.Direction direction);
 
     List<LevelJumpDTO> findLevelJumpDTOsByNumberType(Integer numberType, Sort.Direction direction);
 
@@ -31,6 +31,7 @@ public interface LevelJumpService {
 
     //查询全部条件，包括解锁和通关
     List<LevelCondition> findAllLevelCondition();
+
     //查询全部荣誉
     List<LevelHonor> findAllLevelHonor();
 }

src/main/java/com/YuyeTech/TPlat/service/impl/LevelJumpServiceImpl.java

@@ -34,8 +34,8 @@ public class LevelJumpServiceImpl implements LevelJumpService {
     private UserLevelRepository userLevelRepository;
 
     @Override
-    public List<LevelJump> findLevelJumpsByNumberType(Integer numberType, Sort.Direction direction) {
-        return levelJumpRepository.findAllByNumberType(numberType, Sort.by(direction, "sort"));
+    public List<LevelJump> findLevelJumpsByNumberTypeAndType(Integer numberType, Integer type, Sort.Direction direction) {
+        return levelJumpRepository.findAllByNumberTypeAndType(numberType, type, Sort.by(direction, "sort"));
     }
 
     @Override
@@ -46,7 +46,7 @@ public class LevelJumpServiceImpl implements LevelJumpService {
     @Override
     public List<LevelJumpDTO> findLevelJumpDTOsByNumberType(Integer numberType, Sort.Direction direction) {
 
-        List<LevelJump> levelJumpList = levelJumpRepository.findAllByNumberType(numberType, Sort.by(direction, "sort"));
+        List<LevelJump> levelJumpList = levelJumpRepository.findAllByNumberTypeAndType(numberType, 1,Sort.by(direction, "sort"));
         List<LevelJumpDTO> levelJumpDTOList = levelJumpList.stream().map(
                 e -> new LevelJumpDTO(
                         e.getId(),