wangliang 1 год назад
Родитель
Сommit
ce0f7162b6

+ 15 - 21
sop-business/src/main/java/com/qmth/sop/business/service/impl/TBCrmDetailServiceImpl.java

@@ -185,32 +185,26 @@ public class TBCrmDetailServiceImpl extends ServiceImpl<TBCrmDetailMapper, TBCrm
                     if (CollectionUtils.isNotEmpty(courseNameSet)) {
                         List<TBCrmDetail> tbCrmDetailListAll = new ArrayList<>();
                         int size = courseNameSet.size();
-                        if (size > 500) {
-                            List<String> courseNameList = new ArrayList<>(courseNameSet);
-                            int max = 500, min = 0;
-                            while (max <= size) {
-                                List<TBCrmDetail> tbCrmDetailTempList = tbCrmDetailService.list(
-                                        new QueryWrapper<TBCrmDetail>().lambda().eq(TBCrmDetail::getCrmNo, crmNo)
-                                                .in(TBCrmDetail::getCourseName, courseNameList.subList(min, max)));
-                                if (CollectionUtils.isNotEmpty(tbCrmDetailTempList)) {
-                                    tbCrmDetailListAll.addAll(tbCrmDetailTempList);
-                                }
-                                if (max == size) {
-                                    break;
-                                }
-                                min = max;
-                                max += max;
-                                if (max >= size) {
-                                    max = size;
-                                }
-                            }
-                        } else {
+                        List<String> courseNameList = new ArrayList<>(courseNameSet);
+                        int max = SystemConstant.PAGE_SIZE_MAX, min = 0;
+                        if (max >= size) {
+                            max = size;
+                        }
+                        while (max <= size) {
                             List<TBCrmDetail> tbCrmDetailTempList = tbCrmDetailService.list(
                                     new QueryWrapper<TBCrmDetail>().lambda().eq(TBCrmDetail::getCrmNo, crmNo)
-                                            .in(TBCrmDetail::getCourseName, courseNameSet));
+                                            .in(TBCrmDetail::getCourseName, courseNameList.subList(min, max)));
                             if (CollectionUtils.isNotEmpty(tbCrmDetailTempList)) {
                                 tbCrmDetailListAll.addAll(tbCrmDetailTempList);
                             }
+                            if (max == size) {
+                                break;
+                            }
+                            min = max;
+                            max += max;
+                            if (max >= size) {
+                                max = size;
+                            }
                         }
                         if (CollectionUtils.isNotEmpty(tbCrmDetailListAll)) {
                             List<String> courseNameDuplicateList = tbCrmDetailListAll.stream()

+ 6 - 1
sop-business/src/main/resources/db/log/wangliang_update_log.sql

@@ -178,4 +178,9 @@ INSERT INTO sys_privilege
 VALUES(3092, 'sop快捷搜索列表', '/api/admin/sop/quick/list', 'URL', 40, 15, 'AUTH', NULL, 1, 1, 0);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(3093, 'sop快捷搜索删除', '/api/admin/sop/quick/delete', 'URL', 40, 16, 'AUTH', NULL, 1, 1, 0);
+VALUES(3093, 'sop快捷搜索删除', '/api/admin/sop/quick/delete', 'URL', 40, 16, 'AUTH', NULL, 1, 1, 0);
+
+-- 2024-05-28
+UPDATE sys_config
+SET org_id=NULL, config_key='sop.quick.count', config_name='sop快捷条数', config_value='5', remark=NULL, enable=1, sort=1, create_id=1, create_time=NULL, update_id=NULL, update_time=NULL
+WHERE id=40;