|
@@ -360,9 +360,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
if (dto.getGsId() != null) {
|
|
if (dto.getGsId() != null) {
|
|
//GS
|
|
//GS
|
|
if (dto.getGsId() == 0L) {
|
|
if (dto.getGsId() == 0L) {
|
|
- criA.where().andIsNull("gs_id");
|
|
|
|
|
|
+ criA.where().andIsNull("gsId");
|
|
} else {
|
|
} else {
|
|
- criA.where().andEquals("gs_id", dto.getGsId());
|
|
|
|
|
|
+ criA.where().andEquals("gsId", dto.getGsId());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (dto.getPitcherId() != null) {
|
|
if (dto.getPitcherId() != null) {
|
|
@@ -2370,7 +2370,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
IF(TIMESTAMPDIFF(HOUR, f.pay_time, NOW()) < 72 , 0, 1) , 0) as is_remove_game_for_system, -- 是否退游 1-是;0-否(系统判定)
|
|
IF(TIMESTAMPDIFF(HOUR, f.pay_time, NOW()) < 72 , 0, 1) , 0) as is_remove_game_for_system, -- 是否退游 1-是;0-否(系统判定)
|
|
IFNULL(j.is_remove_game,2) as is_remove_game, -- 是否退游 1-是;0-否;2-代表未操作数据
|
|
IFNULL(j.is_remove_game,2) as is_remove_game, -- 是否退游 1-是;0-否;2-代表未操作数据
|
|
IFNULL(j.is_wake_up,2) as is_wake_up, -- 是否唤醒 1-是;0-否 2-未操作
|
|
IFNULL(j.is_wake_up,2) as is_wake_up, -- 是否唤醒 1-是;0-否 2-未操作
|
|
- j.gs_id as gs_id, -- GS_ID
|
|
|
|
|
|
+ j.gs_id as gsId, -- GS_ID
|
|
j.customer_service_id as customer_service_id, -- 客服ID
|
|
j.customer_service_id as customer_service_id, -- 客服ID
|
|
j.oper_user_id as oper_user_id, -- 运营ID
|
|
j.oper_user_id as oper_user_id, -- 运营ID
|
|
j.is_delete as is_delete, -- 是否删除 1-删除;0-正常
|
|
j.is_delete as is_delete, -- 是否删除 1-删除;0-正常
|