7.7 党建专题7.4需求

src/pages/PartyMemberTopic/PersonInfor/index.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
 import '../Style/ld_style.less';
 import { Input, List, Spin } from 'antd';
 import { getMemberList, memberListSearch } from './service';
-import { isNotEmpty } from '../utils';
+import { isEmpty, isNotEmpty } from '../utils';
 import emblem from '@/assets/topic/emblem.png'
 import { history } from 'umi';
 
@@ -32,6 +32,9 @@ const PersonInfor: React.FC<{}> = (props: any) => {
     if (isNotEmpty(props.location.state?.branchCode)) {
       params['belongBranch'] = props.location.state?.branchCode;
     }
+    if (isNotEmpty(props.location.state?.belongBranchName)) {
+      params['belongBranchName'] = props.location.state?.belongBranchName;
+    }
     setLoading(true);
     memberListSearch(params).then(res => {
       if (res?.code == 200) {
@@ -50,7 +53,7 @@ const PersonInfor: React.FC<{}> = (props: any) => {
     window.history.go(-1);
   }
   useEffect(() => {
-    if (isNotEmpty(props.location.state?.branchCode)) {//有党支部
+    if (isNotEmpty(props.location.state?.branchCode) && isEmpty(props.location.state?.belongBranchName)) {//有省代码，无党支部
       getMemberData(props.location.state?.branchCode);
     } else {
       onSearch(props.location.state?.param);
@@ -85,7 +88,7 @@ const PersonInfor: React.FC<{}> = (props: any) => {
             dataSource={memberData}
             renderItem={item => (
               <List.Item>
-                <div className="wrapper">
+                <div>
                   <div className="top-bg">
                     <div className="tit">{item.branchName}</div>
                     <div className="text-r">