Merge branch 'master' of http://git.ycjcjy.com/kypay/global_funding-pc-merchant

src/pages/authentication/components/EveryoneInfo.jsx

@@ -22,6 +22,11 @@ export default (props) => {
   const onFinish = (values) => {
     console.log("----------->", values);
     const authorizedPersonId = "authorizedPerson-beneficiaryId";
+
+    const conpanyDirectorId = "conpanyDirector-beneficiaryId";
+
+    const id = values[authorizedPersonId] || values[conpanyDirectorId];
+
     // 被授权人
     let authorizedPerson = {},
       //企业董事
@@ -45,14 +50,21 @@ export default (props) => {
         otherBeneficiary[parseInt(prefix) - 1][prefix1] = values[key];
       }
     }
-    // const data = [, otherBeneficiary];
+    let beneficiaryInfoList = [];
+    if ((authorizedPerson = {})) {
+      beneficiaryInfoList = [conpanyDirector];
+    } else if ((conpanyDirector = {})) {
+      beneficiaryInfoList = [authorizedPerson];
+    } else {
+      beneficiaryInfoList = [authorizedPerson, conpanyDirector];
+    }
+
     const data = {
-      beneficiaryInfoList: [authorizedPerson, conpanyDirector],
+      beneficiaryInfoList: beneficiaryInfoList,
       beneficiaryItemList: otherBeneficiary,
     };
-    console.log(data);
 
-    putTaCompanyBeneficiaryInfo(values[authorizedPersonId], data).then(
+    putTaCompanyBeneficiaryInfo(id, data).then(
       (res) => {
         setIndex(index + 1);
       }
@@ -73,7 +85,7 @@ export default (props) => {
         if (res) {
           const BeneficiaryNum = res[1]?.length || 0;
 
-          setOtherBeneficiaryNum(BeneficiaryNum || 1)
+          setOtherBeneficiaryNum(BeneficiaryNum || 1);
           const isOtherBeneficiary = BeneficiaryNum > 0 ? "1" : "0";
 
           const data = (res[0] || [])
@@ -142,9 +154,9 @@ export default (props) => {
               );
               return (
                 <>
-                  {authorizedPerson ? (
+                  {authorizedPerson && (
                     <RadioTitle identity="authorizedPerson" />
-                  ) : null}
+                  )}
                   {conpanyDirector ? (
                     <RadioTitle identity="conpanyDirector" />
                   ) : null}