|
@@ -14,6 +14,7 @@ import com.zanxiang.game.data.serve.pojo.vo.PlayerRoleDataVO;
|
|
|
import com.zanxiang.game.data.serve.service.IPlayerDataService;
|
|
|
import com.zanxiang.game.data.serve.utils.Page;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.apache.commons.collections4.CollectionUtils;
|
|
|
import org.apache.commons.lang3.BooleanUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.nutz.dao.Cnd;
|
|
@@ -69,6 +70,9 @@ public class PlayerDataServiceImpl implements IPlayerDataService {
|
|
|
if (StringUtils.isNotBlank(dto.getNickname())) {
|
|
|
cri.where().andLike("nickname", dto.getNickname());
|
|
|
}
|
|
|
+ if (StringUtils.isNotBlank(dto.getRoleName())) {
|
|
|
+ cri.where().andLike("last_game_role_name", dto.getRoleName());
|
|
|
+ }
|
|
|
if (StringUtils.isNotBlank(dto.getMobile())) {
|
|
|
cri.where().andEquals("mobile", dto.getMobile());
|
|
|
}
|
|
@@ -371,8 +375,8 @@ public class PlayerDataServiceImpl implements IPlayerDataService {
|
|
|
if (StringUtils.isNotBlank(dto.getRoleName())) {
|
|
|
cri.where().andEquals("role_name", dto.getRoleName());
|
|
|
}
|
|
|
- if (dto.getServerId() != null) {
|
|
|
- cri.where().andEquals("server_id", dto.getServerId());
|
|
|
+ if (CollectionUtils.isNotEmpty(dto.getServerId())) {
|
|
|
+ cri.where().andIn("server_id", dto.getServerId().toArray(String[]::new));
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(dto.getOs())) {
|
|
|
cri.where().andEquals("os", dto.getOs());
|