fix: 调整最近使用列编办对不上的数据不予显示

src/pages/Product/Cloud/index.jsx

@@ -174,8 +174,7 @@ const Cloud = () => {
         }
         return obj
       }, {}),
-      renderText: (_, record) =>
-        record.latestUsedName && <Tag color="purple">{record.latestUsedName}</Tag>
+      renderText: (_, record) => record.latestUsedName && <Tag color="purple">{record.latestUsedName}</Tag>
     },
     {
       title: '地区',
@@ -218,9 +217,11 @@ const Cloud = () => {
         return obj
       }, {}),
       renderText: (_, record) => (
-        <div className="children:m-2px">
+        <div className="!children:m-2px">
           {record.upgrade_list
-            .filter(item => item.isUpgrade)
+            .filter(
+              item => item.isUpgrade && compilation?.findIndex(i => i._id === item.compilationID) !== -1
+            )
             .map(item => {
               return (
                 <Tag color="purple" key={item.compilationID}>

src/pages/Product/Road/Enterprise/index.jsx

@@ -102,13 +102,15 @@ const Enterprise = ({ compilationv2, shouldUpdate }) => {
       width: 110,
       render: (_, record) => (
         <div className="children:m-2px">
-          {record.usedCptList.map(item => {
-            return (
-              <Tag color="purple" key={item.compilationID}>
-                {compilationv2?.find(i => i.ID === item.compilationID)?.name}
-              </Tag>
-            )
-          })}
+          {record.usedCptList
+            .filter(u => compilationv2.findIndex(i => i.ID === u.compilationID) !== -1)
+            .map(item => {
+              return (
+                <Tag color="purple" key={item.compilationID}>
+                  {compilationv2?.find(i => i.ID === item.compilationID)?.name}
+                </Tag>
+              )
+            })}
         </div>
       )
     },
@@ -121,54 +123,52 @@ const Enterprise = ({ compilationv2, shouldUpdate }) => {
     }
   ]
   return (
-    <div>
-      <BasicTable
-        rowKey={record => record.ID}
-        actionRef={tRef}
-        columns={columns}
-        params={state.params}
-        request={async (params, sort, filter) => {
-          const sortOrder = generateSortField(sort)
-          const {
-            code = -1,
-            data: { list = [], total = 0 }
-          } = await queryRoadcompanyList({ ...params, ...sortOrder, ...filter })
-          return {
-            data: list,
-            success: code === consts.RET_CODE.SUCCESS,
-            total
-          }
-        }}
-        toolbar={{
-          search: (
-            <Input.Search style={{ width: '250px' }} allowClear={true} placeholder="请输入手机、QQ进行搜索" />
-          ),
-          actions: [
-            <Button
-              type="primary"
-              key="addClientBtn"
-              disabled={!hasAddPerm}
-              onClick={() =>
-                dispatchModal('M_ENTERPRISE_ADD', {
-                  onConfirm: handleAddEnterprise,
-                  disabled: false,
-                  defaultValues: {
-                    licenceNum: 1
-                  },
-                  reload: () => tRef.current?.reload()
-                })
-              }>
-              创建企业
-            </Button>
-          ]
-        }}
-        search={false}
-        pagination={{
-          pageSize: 20,
-          showSizeChanger: false
-        }}
-      />
-    </div>
+    <BasicTable
+      rowKey={record => record.ID}
+      actionRef={tRef}
+      columns={columns}
+      params={state.params}
+      request={async (params, sort, filter) => {
+        const sortOrder = generateSortField(sort)
+        const {
+          code = -1,
+          data: { list = [], total = 0 }
+        } = await queryRoadcompanyList({ ...params, ...sortOrder, ...filter })
+        return {
+          data: list,
+          success: code === consts.RET_CODE.SUCCESS,
+          total
+        }
+      }}
+      toolbar={{
+        search: (
+          <Input.Search style={{ width: '250px' }} allowClear={true} placeholder="请输入手机、QQ进行搜索" />
+        ),
+        actions: [
+          <Button
+            type="primary"
+            key="addClientBtn"
+            disabled={!hasAddPerm}
+            onClick={() =>
+              dispatchModal('M_ENTERPRISE_ADD', {
+                onConfirm: handleAddEnterprise,
+                disabled: false,
+                defaultValues: {
+                  licenceNum: 1
+                },
+                reload: () => tRef.current?.reload()
+              })
+            }>
+            创建企业
+          </Button>
+        ]
+      }}
+      search={false}
+      pagination={{
+        pageSize: 20,
+        showSizeChanger: false
+      }}
+    />
   )
 }
 

src/pages/Product/Road/Personal/index.jsx

@@ -139,13 +139,15 @@ const Personal = props => {
       // }, {}),
       renderText: (_, record) => (
         <div className="children:m-2px">
-          {record.usedCptList.map(item => {
-            return (
-              <Tag color="purple" key={item.compilationID}>
-                {compilationv2?.find(i => i.ID === item.compilationID)?.name}
-              </Tag>
-            )
-          })}
+          {record.usedCptList
+            .filter(u => compilationv2.findIndex(i => i.ID === u.compilationID) !== -1)
+            .map(item => {
+              return (
+                <Tag color="purple" key={item.compilationID}>
+                  {compilationv2?.find(i => i.ID === item.compilationID)?.name}
+                </Tag>
+              )
+            })}
         </div>
       )
     },
@@ -224,42 +226,40 @@ const Personal = props => {
     setState({ ...state, params: { ...state.params, search: value } })
   }
   return (
-    <div>
-      <BasicTable
-        actionRef={tRef}
-        rowKey={record => record.ID}
-        columns={columns}
-        params={state.params}
-        request={async (params, sort, filter) => {
-          const sortOrder = generateSortField(sort)
-          const {
-            code = -1,
-            data: { list = [], total = 0 }
-          } = await queryRoadpricingListV2({ ...params, ...sortOrder, ...filter })
-          return {
-            data: list,
-            success: code === consts.RET_CODE.SUCCESS,
-            total
-          }
-        }}
-        toolbar={{
-          search: (
-            <Input.Search
-              style={{ width: '250px' }}
-              allowClear={true}
-              placeholder="请输入手机、QQ进行搜索"
-              onSearch={handleSearch}
-            />
-          ),
-          actions: []
-        }}
-        search={false}
-        pagination={{
-          pageSize: 20,
-          showSizeChanger: false
-        }}
-      />
-    </div>
+    <BasicTable
+      actionRef={tRef}
+      rowKey={record => record.ID}
+      columns={columns}
+      params={state.params}
+      request={async (params, sort, filter) => {
+        const sortOrder = generateSortField(sort)
+        const {
+          code = -1,
+          data: { list = [], total = 0 }
+        } = await queryRoadpricingListV2({ ...params, ...sortOrder, ...filter })
+        return {
+          data: list,
+          success: code === consts.RET_CODE.SUCCESS,
+          total
+        }
+      }}
+      toolbar={{
+        search: (
+          <Input.Search
+            style={{ width: '250px' }}
+            allowClear={true}
+            placeholder="请输入手机、QQ进行搜索"
+            onSearch={handleSearch}
+          />
+        ),
+        actions: []
+      }}
+      search={false}
+      pagination={{
+        pageSize: 20,
+        showSizeChanger: false
+      }}
+    />
   )
 }