Merge remote-tracking branch 'origin/master'

service/src/main/java/com/dayou/service/impl/AssetsServiceImpl.java

@@ -245,7 +245,7 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
     public AssetsOrderFundInvoiceVO getOrderFundInvoiceById(Long id) {
         AssetsOrderFundInvoiceVO assetsOrderFundInvoiceVO = assetsMapper.getOrderFundInvoiceById(id);
         assetsOrderFundInvoiceVO.setFinanceInvoiceVoList(financeInvoiceService.list(new LambdaQueryWrapper<FinanceInvoice>()
-                .eq(FinanceInvoice::getOrderFundId, assetsOrderFundInvoiceVO.getId())
+                .eq(ObjectUtil.isNotNull(assetsOrderFundInvoiceVO.getId()),FinanceInvoice::getOrderFundId, assetsOrderFundInvoiceVO.getId())
                 .eq(BaseEntity::getDeleted, 0)));
         return assetsOrderFundInvoiceVO;
     }

sql/update_sql.sql

@@ -565,4 +565,10 @@ ALTER TABLE `major_target` ADD defined_evaluation_method VARCHAR(128) NULL COMME
     修改人:吴长林
     已更新到test-env
  */
-ALTER TABLE `personal_production` ADD is_online bit(1) NULL COMMENT '是否是线上产品';
+ALTER TABLE `personal_production` ADD is_online bit(1) NULL COMMENT '是否是线上产品';
+
+/**
+  以上SQL已同步到测试环境
+  同步日期：2024-07-16
+  操作人：苟耕铨
+ */