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

@@ -1113,6 +1113,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
         criteria.where().andNotIsNull("ip");
         criteria.where().andNotEquals("ip","null");
         criteria.where().andNotEquals("ip","");
+        criteria.where().andNotIsNull("role_id");
+        criteria.where().andNotEquals("role_id","null");
+        criteria.where().andNotEquals("role_id","");
         String ipCountList = getIpCountList(criteria);
         Sql sql = Sqls.create(ipCountList);
         sql.setCallback(Sqls.callback.maps());