Merge branch 'develop' of http://git.zanxiangnet.com/wjx/ad-manage

src/pages/launchSystemV3/material/cloudNew/selectGroupCloudNew.tsx

@@ -73,7 +73,7 @@ const SelectGroupCloudNew: React.FC<CLOUDNEW.SelectGroupCloudNewProps> = ({ num,
                     const GrounpArray = Object.keys(groupAccount).map(function (group) {
                         return groupAccount[group];
                     })
-                    if (GrounpArray.length === 1) {
+                    if (GrounpArray.length === 1 && !groupAccount['undefined']) {
                         setOwnerAccountId(GrounpArray?.[0]?.[0]?.authMainAccountId || GrounpArray?.[0]?.[0]?.accountId)
                     } else if (GrounpArray.length === 2 && groupAccount?.['undefined']?.length === 1) {
                         const undefinedAccount = groupAccount?.['undefined'][0].accountId
@@ -120,7 +120,7 @@ const SelectGroupCloudNew: React.FC<CLOUDNEW.SelectGroupCloudNewProps> = ({ num,
 
     return <Spin spinning={getAllUserAccount.loading} wrapperClassName={'select_group_spin'}>
         <div className={style.select_cloudNew_layout}>
-            {ownerAccountId ? <>
+            {ownerAccountId && ownerAccountId !== -1 ? <>
                 {/* 搜索 */}
                 <SelectGroupSearch
                     onSearch={(value) => { setSearchParams(value) }}
@@ -329,7 +329,7 @@ const SelectGroupCloudNew: React.FC<CLOUDNEW.SelectGroupCloudNewProps> = ({ num,
                 </Card>
             </> : ownerAccountId === -1 ? <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
                 <Result
-                    title="错误"
+                    title="警告"
                     status="500"
                     subTitle="选择的账户不在一个账户分组中."
                 />

src/pages/launchSystemV3/tencentAdPutIn/create/SelectAccount/index.tsx

@@ -56,7 +56,7 @@ const SelectAccount: React.FC<Props> = ({ putInType, accountCreateLogs, setAccou
             const GrounpArray = Object.keys(groupAccount).map(function (group) {
                 return groupAccount[group];
             })
-            if (GrounpArray.length === 1) {
+            if (GrounpArray.length === 1 && !groupAccount['undefined']) {
                 return { authMainAccountId: GrounpArray?.[0]?.[0]?.authMainAccountId || GrounpArray?.[0]?.[0]?.accountId, isSelectRemote: true }
             } else if (GrounpArray.length === 2 && groupAccount?.['undefined']?.length === 1) {
                 const undefinedAccount = groupAccount?.['undefined'][0].accountId