wjx 2 هفته پیش
والد
کامیت
5a57f39a30
2فایلهای تغییر یافته به همراه6 افزوده شده و 2 حذف شده
  1. 5 1
      src/pages/weComTask/components/filterUser/newFiterUser.tsx
  2. 1 1
      src/pages/weComTask/page/device/index.tsx

+ 5 - 1
src/pages/weComTask/components/filterUser/newFiterUser.tsx

@@ -60,7 +60,11 @@ const NewFilterUser: React.FC<NewFilterUserProps> = ({ bookCityList, configType
                 params.groupChatNames = groupChatNames.join(',')
             }
             const keys = Object.keys(params)
-            if (keys.includes('repeatRangType') || keys.includes('repeatOperateType') || keys.includes('minCorpIdCount') || keys.includes('minCorpUserIdCount')) {
+            if ((keys.includes('repeatRangType') && params?.repeatRangType !== null) ||
+                (keys.includes('repeatOperateType') && params?.repeatOperateType !== null) ||
+                (keys.includes('minCorpIdCount') && params?.minCorpIdCount !== null) ||
+                (keys.includes('minCorpUserIdCount') && params?.minCorpUserIdCount !== null)
+            ) {
                 params.isRepeat = true
             }
             form.setFieldsValue(params)

+ 1 - 1
src/pages/weComTask/page/device/index.tsx

@@ -98,7 +98,7 @@ const DevicePage: React.FC = () => {
                         columns={WeTableConfig()}
                         bordered
                         pagination={{
-                            pageSize: 20
+                            defaultPageSize: 20
                         }}
                         rowClassName={(record) => record?.phoneInfo?.online && record?.phoneInfo?.accessibility != false ? '' : style.notOnline}
                         rowKey={(row) => userId + '_' + row.corpUserId + '_' + row.corpId}