修改营销系统

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/MarketingCampaignEntityServiceImpl.java

@@ -16,7 +16,6 @@ import com.storlead.trade.service.MarketingCampaignEntityService;
 import com.storlead.trade.vo.MarketingCampaignVO;
 import com.storlead.framework.common.constant.CommonConstant;
 import com.storlead.framework.common.result.Result;
-import com.storlead.framework.mybatis.entity.SysBaseField;
 import com.storlead.framework.mybatis.service.impl.MyBaseServiceImpl;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -44,12 +43,25 @@ public class MarketingCampaignEntityServiceImpl
         LambdaQueryWrapper<MarketingCampaignEntity> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(MarketingCampaignEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
         IPage<MarketingCampaignEntity> pageList = this.page(page, queryWrapper);
-
-//        List<MarketingCampaignEntity> list = this.list(queryWrapper);
-        pageVO = SysBaseField.page(pageList, MarketingCampaignVO.class);
         if (CollectionUtils.isEmpty(pageList.getRecords())){
             return Result.result(pageVO);
         }
+
+        //        List<MarketingCampaignEntity> list = this.list(queryWrapper);
+        // 手动转换 page（避免 Java 17 下 Orika 的 InaccessibleObjectException）
+        IPage<MarketingCampaignVO> pageVo = new Page<>(page.getCurrent(), page.getSize());
+        pageVo.setTotal(pageList.getTotal());
+        if (!CollectionUtils.isEmpty(pageList.getRecords())) {
+            List<MarketingCampaignVO> voList = new ArrayList<>();
+            for (MarketingCampaignEntity entity : pageList.getRecords()) {
+                MarketingCampaignVO vo = new MarketingCampaignVO();
+                BeanUtils.copyProperties(entity, vo);
+                voList.add(vo);
+            }
+            pageVo.setRecords(voList);
+        }
+        pageVO = pageVo;
+
         List<MarketingCampaignVO> marketingCampaignVOList = pageVO.getRecords();
 
         List<Long> marketingCampaignIdList = marketingCampaignVOList.stream().map(MarketingCampaignVO::getId).collect(Collectors.toList());
@@ -61,7 +73,7 @@ public class MarketingCampaignEntityServiceImpl
         List<Long> customerAnalysisIdList = customerBaseEntityList.stream().map(CustomerBaseEntity::getCustomerAnalysisId).collect(Collectors.toList());
         LambdaQueryWrapper<CustomerAnalysisResultEntity> customerAnalysisEntityQueryWrapper = new LambdaQueryWrapper<>();
         customerAnalysisEntityQueryWrapper.eq(CustomerAnalysisResultEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
-        customerAnalysisEntityQueryWrapper.in(CustomerAnalysisResultEntity::getId, customerAnalysisIdList);
+        customerAnalysisEntityQueryWrapper.in(!CollectionUtils.isEmpty(customerAnalysisIdList),CustomerAnalysisResultEntity::getId, customerAnalysisIdList);
         List<CustomerAnalysisResultEntity> customerAnalysisResultEntityList = customerAnalysisResultEntityService.list(customerAnalysisEntityQueryWrapper);
         //将customerAnalysisResultEntityList按照customerBaseEntityList对应的id写入pageVO的customerList中