fix

src/components/QueryForm/index.tsx

@@ -2,7 +2,7 @@ import { Button, Checkbox, Col, DatePicker, Form, Input, InputNumber, Radio, Row
 import React, { useEffect, useState } from "react"
 import moment from "moment"
 import { useAjax } from "@/Hook/useAjax"
-import { getAllOfOwnerUserApi, getChannelChoiceListApi, getGameChoiceListApi, getCpChoiceListApi, getGameChoiceParentListType1Api, getPayListApi, getSubUserWithSelfListApi, getTtAllUserListApi, getUserSystemTypeChoiceListApi, getRoleUserListApi, getGameServerListApi, getGameServerUnListApi, getAccountListNewApi, getAgentListNewApi, getPitcherListNewApi, getGameListNewApi, getVipLevelApi, getGameServerNewApi } from "@/services/gameData"
+import { getAllOfOwnerUserApi, getChannelChoiceListApi, getGameChoiceListApi, getCpChoiceListApi, getGameChoiceParentListType1Api, getPayListApi, getSubUserWithSelfListApi, getTtAllUserListApi, getUserSystemTypeChoiceListApi, getRoleUserListApi, getGameServerListApi, getGameServerUnListApi, getAccountListNewApi, getAgentListNewApi, getPitcherListNewApi, getGameListNewApi, getVipLevelApi, getGameUnMergeServerListApi } from "@/services/gameData"
 import { ActiveEnum, DeviceType, LoginType, PayStatus, TYPE, gameClassifyEnum } from "./const"
 import { ADSTATUSEnum as ADSTTTATUSEnum } from "@/pages/gameDataStatistics/adlist/monitor/const"
 import { ADSTATUSEnum } from "@/pages/gameDataStatistics/adlist/tencentMonitor/const"
@@ -67,7 +67,7 @@ interface Props {
     isSuperParentGameId?: boolean
     /** 是否开启 是否合服 搜索 */
     isIsMergeServer?: boolean
-    /** 是否开启 是否参与过合服 搜索 */
+    /** 是否开启 是否未参与过合服 搜索 */
     isIsParticipateMerge?: boolean
     /** 是否开启 游戏应用类型 搜索 */
     isGameType?: boolean
@@ -279,6 +279,7 @@ const QueryForm: React.FC<Props> = (props) => {
     const parentGameIds = Form.useWatch('parentGameIds', form)
     const gameDimension = Form.useWatch('gameDimension', form)
     const consumeDay = Form.useWatch('consumeDay', form)
+    const isParticipateMerge = Form.useWatch('isParticipateMerge', form)
     const [accountList, setAccountList] = useState<any[]>([])
     const [userIdList, setUserIdList] = useState<any[]>([])
     const [gsList, setGsList] = useState<any[]>([])
@@ -302,6 +303,7 @@ const QueryForm: React.FC<Props> = (props) => {
     const getVipLevel = useAjax(() => getVipLevelApi())
     const getRoleUserList = useAjax((params) => getRoleUserListApi(params))
     const getGameServerList = useAjax((params) => getGameServerListApi(params))
+    const getGameUnMergeServerList = useAjax((params) => getGameUnMergeServerListApi(params))
     const getGameServerUnList = useAjax((params) => getGameServerUnListApi(params))
     const getAccountListNew = useAjax((params) => getAccountListNewApi(params))
     const getAgentListNew = useAjax((params) => getAgentListNewApi(params))
@@ -864,8 +866,10 @@ const QueryForm: React.FC<Props> = (props) => {
                         if (isServerIds && e) {
                             form.setFieldsValue({ serverIds: undefined })
                             getGameServerList.run({ gameId: e })
+                            getGameUnMergeServerList.run({ gameId: e })
                         } else {
                             getGameServerList?.data && getGameServerList.mutate([])
+                            getGameUnMergeServerList?.data && getGameUnMergeServerList.mutate([])
                         }
                     }}
                 >
@@ -953,7 +957,7 @@ const QueryForm: React.FC<Props> = (props) => {
                         }
                         loading={getGameServerList.loading}
                     >
-                        {getGameServerList?.data?.filter((item: { isSourceServer: any }) => (isIsMergeServer && ((!isMergeServer && item.isSourceServer) || (isMergeServer && !item.isSourceServer))) || !isIsMergeServer)?.map((item: any) => <Select.Option value={item.serverId} key={item.serverId}>{item.serverName}</Select.Option>)}
+                        {(isIsParticipateMerge && isParticipateMerge) ? getGameUnMergeServerList?.data?.filter((item: { isSourceServer: any }) => (isIsMergeServer && ((!isMergeServer && item.isSourceServer) || (isMergeServer && !item.isSourceServer))) || !isIsMergeServer)?.map((item: any) => <Select.Option value={item.serverId} key={item.serverId}>{item.serverName}</Select.Option>) : getGameServerList?.data?.filter((item: { isSourceServer: any }) => (isIsMergeServer && ((!isMergeServer && item.isSourceServer) || (isMergeServer && !item.isSourceServer))) || !isIsMergeServer)?.map((item: any) => <Select.Option value={item.serverId} key={item.serverId}>{item.serverName}</Select.Option>)}
                     </Select>
                 </Form.Item></Col>}
 
@@ -962,6 +966,11 @@ const QueryForm: React.FC<Props> = (props) => {
                     <Checkbox onChange={() => form.setFieldsValue({ serverIds: undefined })}>是否合服</Checkbox>
                 </Form.Item></Col>}
 
+                {/* 是否参与过合服 */}
+                {isIsParticipateMerge && <Col><Form.Item name='isParticipateMerge' valuePropName="checked">
+                    <Checkbox onChange={() => form.setFieldsValue({ serverIds: undefined })}>是否未参与过合服</Checkbox>
+                </Form.Item></Col>}
+
                 {/* 区服id */}
                 {isServerIdUn && <Col><Form.Item name='serverId'>
                     <Select
@@ -982,11 +991,6 @@ const QueryForm: React.FC<Props> = (props) => {
                 </Form.Item></Col>}
             </>}
 
-            {/* 是否参与过合服 */}
-            {isIsParticipateMerge && <Col><Form.Item name='isParticipateMerge' valuePropName="checked">
-                <Checkbox>是否参与过合服</Checkbox>
-            </Form.Item></Col>}
-
             {/* 游戏应用类型搜索 */}
             {isGameType && <Col><Form.Item name='gameType'>
                 <Select

src/pages/gameDataStatistics/roleOperate/roleFightingRanking/index.tsx

@@ -14,7 +14,7 @@ import columns12 from "./tableConfig"
 const RoleFightingRanking: React.FC = () => {
 
     /********************************/
-    const [queryForm, setQueryForm] = useState<GetCombatRankingProps>({ pageNum: 1, pageSize: 100, sourceSystem: 'ZX_ONE', beginDate: moment().format('YYYY-MM-DD'), endDate: moment().format('YYYY-MM-DD'), isMergeServer: true })
+    const [queryForm, setQueryForm] = useState<GetCombatRankingProps>({ pageNum: 1, pageSize: 100, sourceSystem: 'ZX_ONE', beginDate: moment().format('YYYY-MM-DD'), endDate: moment().format('YYYY-MM-DD'), isMergeServer: true, isParticipateMerge: true })
 
     const getCombatRankingList = useAjax((params) => getCombatRankingListApi(params))
     /********************************/
@@ -26,7 +26,7 @@ const RoleFightingRanking: React.FC = () => {
     return <div>
         <TableData
             leftChild={<QueryForm
-                initialValues={{ sourceSystem: 'ZX_ONE', serverDay: [moment(), moment()], isMergeServer: true }}
+                initialValues={{ sourceSystem: 'ZX_ONE', serverDay: [moment(), moment()], isMergeServer: true, isParticipateMerge: true }}
                 onChange={(data: any) => {
                     console.log(data)
                     const { parentId, serverDay, ...params } = data

src/services/gameData/index.ts

@@ -130,6 +130,15 @@ export async function getGameServerListApi(params: { gameId: number }) {
     return request(gameApi + `/manage/gameServer/all/server/list`, { method: 'GET', params });
 }
 
+/**
+ * 未参与合服的区服
+ * @param params 
+ * @returns 
+ */
+export async function getGameUnMergeServerListApi(params: { gameId: number }) {
+    return request(gameApi + `/manage/gameServer/unMerge/server/list`, { method: 'GET', params });
+}
+
 export async function getGameServerUnListApi(params: { gameId: number }) {
     return request(gameApi + `/manage/gameServer/all/server/list`, { method: 'GET', params });
 }

src/services/gameData/roleOperate.ts

@@ -231,6 +231,7 @@ export interface GetCombatRankingProps extends Paging, SortProps {
     rankingNum?: number     // 排名的范围
     serverIds?: number[],   // 区服
     isMergeServer?: boolean
+    isParticipateMerge?: boolean
 }
 
 export async function getCombatRankingListApi(data: GetCombatRankingProps) {