:fix:角色战力排行榜bug

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/RoleManageServiceImpl.java

@@ -1053,11 +1053,11 @@ public class RoleManageServiceImpl implements IRoleManageService {
             cri.where().andEquals("is_merge", 0);
         }
         //ture为参与过的 查询数据为1的是参与的 0是未参与的
-        if (dto.getIsParticipateMerge() != null&&dto.getIsParticipateMerge()) {
-            cri.where().andEquals("is_merge", 1);
-        }else {
-            cri.where().andEquals("is_merge", 0);
-        }
+//        if (dto.getIsParticipateMerge() != null&&dto.getIsParticipateMerge()) {
+//            cri.where().andEquals("is_merge", 1);
+//        }else {
+//            cri.where().andEquals("is_merge", 0);
+//        }
         //拼接分组条件
         cri.getGroupBy().groupBy("source_system" , "boss_server_id" , "parent_game_id" , "super_game_id");
         //分页
@@ -1187,11 +1187,11 @@ public class RoleManageServiceImpl implements IRoleManageService {
             cri.where().andEquals("source_system", dto.getSourceSystem());
         }
         //原始服可以参与多次合服，只看最新一次的合服的原始服信息  是否参与过合服:1是，0否
-        if(dto.getIsParticipateMerge()!=null&&dto.getIsParticipateMerge()){
-            cri.where().andEquals("is_merge", 1);
-        }else {
+//        if(dto.getIsParticipateMerge()!=null&&dto.getIsParticipateMerge()){
+//            cri.where().andEquals("is_merge", 1);
+//        }else {
             cri.where().andEquals("is_merge", 0);
-        }
+//        }
 
         /*//拼接分组条件
         cri.getGroupBy().groupBy("source_system" , "server_id" , "boss_server_id" , "super_game_id");*/
@@ -1324,11 +1324,11 @@ public class RoleManageServiceImpl implements IRoleManageService {
             cri.where().andEquals("is_merge", 0);
         }
         //ture为参与过的 查询数据为1的是参与的 0是未参与的
-        if (dto.getIsParticipateMerge() != null&&dto.getIsParticipateMerge()) {
-            cri.where().andEquals("is_merge", 1);
-        }else {
-            cri.where().andEquals("is_merge", 0);
-        }
+//        if (dto.getIsParticipateMerge() != null&&dto.getIsParticipateMerge()) {
+//            cri.where().andEquals("is_merge", 1);
+//        }else {
+//            cri.where().andEquals("is_merge", 0);
+//        }
         /*//拼接分组条件
         cri.getGroupBy().groupBy("source_system" , "boss_server_id" , "super_game_id");*/
         //分页