fix

src/components/QueryForm/index.tsx

@@ -968,7 +968,7 @@ const QueryForm: React.FC<Props> = (props) => {
 
                 {/* 是否参与过合服 */}
                 {isIsParticipateMerge && <Col><Form.Item name='isParticipateMerge' valuePropName="checked">
-                    <Checkbox onChange={() => form.setFieldsValue({ serverIds: undefined })}>是否未参与过合服</Checkbox>
+                    <Checkbox onChange={() => form.setFieldsValue({ serverIds: undefined })}>未参与过合服</Checkbox>
                 </Form.Item></Col>}
 
                 {/* 区服id */}

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

@@ -29,10 +29,11 @@ const RoleFightingRanking: React.FC = () => {
                 initialValues={{ sourceSystem: 'ZX_ONE', serverDay: [moment(), moment()], isMergeServer: true, isParticipateMerge: true }}
                 onChange={(data: any) => {
                     console.log(data)
-                    const { parentId, serverDay, ...params } = data
+                    const { parentId, serverDay, isParticipateMerge, ...params } = data
                     let newQueryForm = JSON.parse(JSON.stringify(queryForm))
                     newQueryForm.pageNum = 1
                     newQueryForm.parentGameId = parentId
+                    newQueryForm.isParticipateMerge = !isParticipateMerge
                     if (serverDay && serverDay?.length === 2) {
                         newQueryForm.beginDate = moment(serverDay[0]).format('YYYY-MM-DD')
                         newQueryForm.endDate = moment(serverDay[1]).format('YYYY-MM-DD')