|
@@ -85,25 +85,31 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
criA.where().andEquals("is_change_game_type", dto.getIsChange());
|
|
criA.where().andEquals("is_change_game_type", dto.getIsChange());
|
|
}
|
|
}
|
|
if (StringUtils.isNotBlank(dto.getWeChatCompany())) {
|
|
if (StringUtils.isNotBlank(dto.getWeChatCompany())) {
|
|
- criA.where().andLike("we_chat_company", dto.getWeChatCompany());
|
|
|
|
|
|
+ //企业微信号
|
|
|
|
+ criA.where().andLike("add_corp_user_id", dto.getWeChatCompany());
|
|
}
|
|
}
|
|
if (StringUtils.isNotBlank(dto.getWeChat())) {
|
|
if (StringUtils.isNotBlank(dto.getWeChat())) {
|
|
- criA.where().andLike("we_chat", dto.getWeChat());
|
|
|
|
|
|
+ //客户微信
|
|
|
|
+ criA.where().andLike("user_wechat", dto.getWeChat());
|
|
}
|
|
}
|
|
if (StringUtils.isNotBlank(dto.getPhone())) {
|
|
if (StringUtils.isNotBlank(dto.getPhone())) {
|
|
- criA.where().andEquals("phone", dto.getPhone());
|
|
|
|
|
|
+ //客户手机号
|
|
|
|
+ criA.where().andEquals("user_phone", dto.getPhone());
|
|
}
|
|
}
|
|
if (dto.getGsId() != null) {
|
|
if (dto.getGsId() != null) {
|
|
criA.where().andEquals("gs_id", dto.getGsId());
|
|
criA.where().andEquals("gs_id", dto.getGsId());
|
|
}
|
|
}
|
|
if (dto.getPitcherId() != null) {
|
|
if (dto.getPitcherId() != null) {
|
|
- criA.where().andEquals("pitcher_id", dto.getPitcherId());
|
|
|
|
|
|
+ //投手
|
|
|
|
+ criA.where().andEquals("put_user_id", dto.getPitcherId());
|
|
}
|
|
}
|
|
if (dto.getOperatorId() != null) {
|
|
if (dto.getOperatorId() != null) {
|
|
- criA.where().andEquals("operator_id", dto.getOperatorId());
|
|
|
|
|
|
+ //运营
|
|
|
|
+ criA.where().andEquals("oper_user_id", dto.getOperatorId());
|
|
}
|
|
}
|
|
if (dto.getCustomerServerId() != null) {
|
|
if (dto.getCustomerServerId() != null) {
|
|
- criA.where().andEquals("customer_server_id", dto.getCustomerServerId());
|
|
|
|
|
|
+ //客服
|
|
|
|
+ criA.where().andEquals("customer_service_id", dto.getCustomerServerId());
|
|
}
|
|
}
|
|
//给充值时间查询条件
|
|
//给充值时间查询条件
|
|
Criteria criTodayAmount = Cnd.cri();
|
|
Criteria criTodayAmount = Cnd.cri();
|