1、修改热门职位逻辑

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/enterprise/EnterpriseMapper.java

@@ -23,7 +23,7 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
         return selectPage(reqVO, new LambdaQueryWrapperX<EnterpriseDO>()
                 .likeIfPresent(EnterpriseDO::getName, reqVO.getName())
                 .likeIfPresent(EnterpriseDO::getAnotherName, reqVO.getAnotherName())
-                .likeIfPresent(EnterpriseDO::getContacts, reqVO.getContacts())
+                .likeIfPresent(EnterpriseDO::getContact, reqVO.getContact())
                 .likeIfPresent(EnterpriseDO::getPhone, reqVO.getPhone())
                 .eqIfPresent(EnterpriseDO::getIndustryId, reqVO.getIndustryId())
                 .eqIfPresent(EnterpriseDO::getFinancingStatus, reqVO.getFinancingStatus())

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/position/PositionServiceImpl.java

@@ -1,7 +1,6 @@
 package com.citu.module.menduner.system.service.position;
 
 import cn.hutool.core.collection.CollUtil;
-import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.module.menduner.system.controller.admin.position.vo.PositionListReqVO;
@@ -243,7 +242,7 @@ public class PositionServiceImpl implements PositionService {
         Integer level = 3;
 
         // 该用户(包括访客)没有埋点
-        if (CollectionUtils.isNotEmpty(idList)) {
+        if (idList.size() < 1) {
             // 随机十条，深度为{level}的数据
             return PositionConvert.INSTANCE.convertList2(positionMapper.getRandomTenByLevel(level));
 
@@ -256,12 +255,12 @@ public class PositionServiceImpl implements PositionService {
             // 找出埋点的职位数据
             List<PositionDO> positionDOList2 = positionMapper.selectListByIdList(idList);
             // 合并数据
-            List<PositionDO> mergedList =  Stream.concat(
-                    // positionDOList1 取前 （idList.size() - positionDOList1.size()）条数据
-                    positionDOList1.stream()
-                         .limit(idList.size() - positionDOList1.size()).collect(Collectors.toList()).stream(),
+            List<PositionDO> mergedList = Stream.concat(
                     // positionDOList2 数据
-                    positionDOList2.stream()
+                    positionDOList2.stream(),
+                    // positionDOList1 取前 （positionDOList1.size()-idList.size()）条数据
+                    positionDOList1.stream()
+                            .limit(positionDOList1.size() - idList.size()).collect(Collectors.toList()).stream()
             ).collect(Collectors.toList());
             return PositionConvert.INSTANCE.convertList2(mergedList);
         }

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/enterprise/EnterpriseServiceImplTest.java

@@ -106,7 +106,7 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest {
         EnterpriseDO dbEnterprise = randomPojo(EnterpriseDO.class, o -> { // 等会查询到
             o.setName(null);
             o.setAnotherName(null);
-            o.setContacts(null);
+            o.setContact(null);
             o.setPhone(null);
             o.setIndustryId(null);
             o.setFinancingStatus(null);
@@ -119,7 +119,7 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest {
         // 测试 anotherName 不匹配
         enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setAnotherName(null)));
         // 测试 contact 不匹配
-        enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setContacts(null)));
+        enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setContact(null)));
         // 测试 phone 不匹配
         enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setPhone(null)));
         // 测试 industryId 不匹配
@@ -134,7 +134,7 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest {
         EnterprisePageReqVO reqVO = new EnterprisePageReqVO();
         reqVO.setName(null);
         reqVO.setAnotherName(null);
-        reqVO.setContacts(null);
+        reqVO.setContact(null);
         reqVO.setPhone(null);
         reqVO.setIndustryId(null);
         reqVO.setFinancingStatus(null);