|
@@ -1118,7 +1118,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
|
|
|
private String getRoleDetailList(Criteria criteria) {
|
|
|
return """
|
|
|
- select role_id roleId ,any_value(role_name) roleNmae,game_id gameId,any_value(game_name) gameName,ip,server_id serverId,any_value(server_name) serverName,user_id userId,any_value(user_name) userName from game_ads.role_ip_monitor
|
|
|
+ select role_id roleId ,any_value(role_name) roleName,game_id gameId,any_value(game_name) gameName,ip,server_id serverId,any_value(server_name) serverName,user_id userId,any_value(user_name) userName from game_ads.role_ip_monitor
|
|
|
""" + criteria + """
|
|
|
group by role_id,game_id,ip,server_id,user_id
|
|
|
""";
|
|
@@ -1129,6 +1129,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
if (StringUtils.isNotEmpty(dto.getRegIp())) {
|
|
|
criteria.where().andEquals("ip", dto.getRegIp());
|
|
|
}
|
|
|
+ if (dto.getExcludeUserId() !=null) {
|
|
|
+ criteria.where().andNotEquals("user_id", dto.getExcludeUserId());
|
|
|
+ }
|
|
|
return criteria;
|
|
|
}
|
|
|
|