From 5b13db7e2c95385d69b8bdb449560bbbfe359146 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 23 十月 2025 17:16:47 +0800
Subject: [PATCH] 广告物料零星结算接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java
index 65c9707..b35f66e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java
@@ -241,12 +241,25 @@
if (StringUtils.hasLength(query.getNameOrCode())){
// 查询出资产名称或者资产编号符合条件的code
List<Integer> assetMainIds = assetMainService.lambdaQuery()
+ .eq(AssetMain::getAssetTypeId,8)
.and(wrapper -> wrapper.like(AssetMain::getAssetName, query.getNameOrCode())
.or()
.like(AssetMain::getAssetCode, query.getNameOrCode()))
.list()
.stream()
- .map(AssetMain::getAssetTypeId)
+ .map(AssetMain::getId)
+ .collect(Collectors.toList());
+ query.setAssetMainIds(assetMainIds);
+ if (assetMainIds.isEmpty()){
+ res.setPageList(new PageInfo<>());
+ return R.ok(res);
+ }
+ }else{
+ List<Integer> assetMainIds = assetMainService.lambdaQuery()
+ .eq(AssetMain::getAssetTypeId,8)
+ .list()
+ .stream()
+ .map(AssetMain::getId)
.collect(Collectors.toList());
query.setAssetMainIds(assetMainIds);
if (assetMainIds.isEmpty()){
--
Gitblit v1.7.1