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

@@ -1096,6 +1096,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
     public List<Map> ipDetailList(RoleIpInfoParamDTO dto) {
         Criteria criteria = Cnd.cri();
         criteria.where().andEquals("role_id", dto.getRoleId());
+        if(CollectionUtils.isNotEmpty(dto.getGameId())){
+            criteria.where().andInList("game_id", dto.getGameId());
+        }
         String ipDetailListSql = getIpDetailListSql(criteria);
         Sql sql = Sqls.create(ipDetailListSql);
         sql.setCallback(Sqls.callback.maps());