Merge branch 'dev' of GameCenter/game-center into master

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

@@ -1107,6 +1107,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
     public List<Map> ipCountList(List<String> ip) {
         Criteria criteria = Cnd.cri();
         criteria.where().andInStrList("ip", ip);
+        criteria.where().andNotIsNull("ip");
+        criteria.where().andNotEquals("ip","null");
+        criteria.where().andNotEquals("ip","");
         String ipCountList = getIpCountList(criteria);
         Sql sql = Sqls.create(ipCountList);
         sql.setCallback(Sqls.callback.maps());
@@ -1269,7 +1272,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
     private String getIpDetailListSql(Criteria criteria) {
         return """
                  select * from game_ads.role_ip_monitor
-                """ + criteria;
+                """ + criteria + """
+                order by role_level desc
+                """;
     }