Merge remote-tracking branch 'origin/package' into package

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/RoleManageServiceImpl.java

@@ -121,10 +121,22 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 map.put("role_amount", str.replaceAll("[\\[\\]]", ""));
             }
             //去除‘null’字符串
-            List<String> nullStringKeys = Arrays.asList("add_corp_user_id", "user_wechat", "remark", "user_phone", "country","corpId","external_user_id","gsAccount");
+            List<String> nullStringKeys = Arrays.asList("add_corp_user_id", "user_wechat", "remark", "user_phone", "country", "corpId", "external_user_id", "gsAccount");
             nullStringKeys.stream()
                     .filter(key -> "null".equals(map.get(key)))
                     .forEach(key -> map.put(key, null));
+            if (map.get("is_remove_game") != null && map.get("is_remove_game").equals(2)) {
+                map.put("is_remove_game", null);
+            }
+            if (map.get("is_change_game_type") != null && map.get("is_change_game_type").equals(2)) {
+                map.put("is_change_game_type", null);
+            }
+            if (map.get("is_add_corp_wechat") != null && map.get("is_add_corp_wechat").equals(2)) {
+                map.put("is_add_corp_wechat", null);
+            }
+            if (map.get("is_wake_up") != null && map.get("is_wake_up").equals(2)) {
+                map.put("is_wake_up", null);
+            }
         }
         //去重userIds
         userIds = userIds.stream().distinct().collect(Collectors.toList());
@@ -420,7 +432,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
             criA.where().andBetween("DATE(role_active_time)", dto.getLastActiveTimeMin(), dto.getLastActiveTimeMax());
         }
         //角色最近充值时间
-        if(dto.getRoleLastPayTimeMin() != null && dto.getRoleLastPayTimeMax() != null){
+        if (dto.getRoleLastPayTimeMin() != null && dto.getRoleLastPayTimeMax() != null) {
             criA.where().andBetween("DATE(role_last_pay_time)", dto.getRoleLastPayTimeMin(), dto.getRoleLastPayTimeMax());
         }
         return criA;
@@ -1550,7 +1562,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 		j.send_gift_id as send_gift_id, -- 最新发送礼包id
                 		k.gift_name as gift_name, -- 礼包名
                 		IFNULL(j.is_change_game_type,2) as is_change_game_type, -- 是否转端 1-是；0-否 2-未操作
-                  		IFNULL(j.is_add_corp_wechat,2) as is_add_corp_wechat, -- 是否添加企微 1-是； 0-否 2-未操作
+                  		IFNULL(j.is_add_corp_wechat,2) as  is_add_corp_wechat, -- 是否添加企微 1-是； 0-否 2-未操作
                 		j.add_corp_user_id as add_corp_user_id, -- 企微号
                 		j.user_wechat as user_wechat, -- 客户微信号
                 		j.user_phone as user_phone, -- 客户手机号