Merge branch 'fix418' into 'v2-220418'

src/pages/priceManage/effect/index.tsx

@@ -150,6 +150,7 @@ export const transformDataForNiceForm = (value: any, ctx: ISchemaFormActions | I
     initValue["commodityMemberLevelList"] = value.commodityMemberLevelList.map(item => ({
       roleId: item.memberRoleId,
       roleName: item.memberRoleName,
+      levelId: item.id,
       ...item,
     }))
     initValue["shopId"] = value["shopId"]

src/pages/procurement/callForBids/addNewBid/constant/index.tsx

@@ -25,6 +25,9 @@ export const fileChangeStringArray = (arr) => arr.map(item => {
 })
 
 
+const isAll = (element) => {
+  return element.some(item => item['provinceCode'] === '0' && item['cityCode'] === '0')
+}
 /** 传参 数据转换 id：判断是否编辑 */
 export const paramsConversionFn = (value) => {
   const { pageStatus } = usePageStatus()
@@ -81,7 +84,8 @@ export const paramsConversionFn = (value) => {
     })
   }
   // 增加不限区域和城市字段
-  if (value?.inviteTenderAreaList?.length > 0) {
+  // if (value?.inviteTenderAreaList?.length > 0) {
+  if (value?.inviteTenderAreaList?.length > 0 && !isAll(value.inviteTenderAreaList)) {
     value.isAllArea = false
     value['inviteTenderAreaList'] = _value.inviteTenderAreaList.map(item => {
       let param = {