:fix:是否退游字段过滤

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

@@ -121,10 +121,13 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 map.put("role_amount", str.replaceAll("[\\[\\]]", ""));
             }
             //去除‘null’字符串
-            List<String> nullStringKeys = Arrays.asList("add_corp_user_id", "user_wechat", "remark", "user_phone", "country","corpId","external_user_id","gsAccount");
+            List<String> nullStringKeys = Arrays.asList("add_corp_user_id", "user_wechat", "remark", "user_phone", "country", "corpId", "external_user_id", "gsAccount");
             nullStringKeys.stream()
                     .filter(key -> "null".equals(map.get(key)))
                     .forEach(key -> map.put(key, null));
+            if (map.get("is_remove_game") != null && map.get("is_remove_game").equals(2)) {
+                map.put("is_remove_game", null);
+            }
         }
         //去重userIds
         userIds = userIds.stream().distinct().collect(Collectors.toList());
@@ -420,7 +423,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
             criA.where().andBetween("DATE(role_active_time)", dto.getLastActiveTimeMin(), dto.getLastActiveTimeMax());
         }
         //角色最近充值时间
-        if(dto.getRoleLastPayTimeMin() != null && dto.getRoleLastPayTimeMax() != null){
+        if (dto.getRoleLastPayTimeMin() != null && dto.getRoleLastPayTimeMax() != null) {
             criA.where().andBetween("DATE(role_last_pay_time)", dto.getRoleLastPayTimeMin(), dto.getRoleLastPayTimeMax());
         }
         return criA;