From 6e492d4d16efff769c2928109fb6a085fcad948d Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 15 六月 2026 08:55:01 +0800
Subject: [PATCH] feat:付款合同编号不存在时错误提示
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java
index d3c0ffa..bcea39f 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.by4cloud.platformx.business.dto.ProductQueryDTO;
import com.by4cloud.platformx.business.vo.ProductTreeVo;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
@@ -24,6 +25,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -80,25 +82,28 @@
@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
@GetMapping("/list" )
@PreAuthorize("@pms.hasPermission('business_product_view')" )
- @Inner(value = false)
public R getProductList(@ParameterObject Product product) {
return R.ok(productService.getProductList(product));
}
/**
* 鍒嗛〉鏌ヨ
- * @param product 浜у搧淇℃伅
+ * @param queryDTO 浜у搧淇℃伅
* @return
*/
@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
@GetMapping("/listByParentId" )
- @PreAuthorize("@pms.hasPermission('business_product_view')" )
- //@Inner(value = false)
- public R getProductListByParentId(@ParameterObject Product product) {
- LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery();
- wrapper.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName());
- wrapper.eq(product.getParentId()!=null,Product::getParentId,product.getParentId());
- return R.ok(BeanUtil.copyToList(productService.listByScope(wrapper), ProductTreeVo.class));
+ public R getProductListByParentId(@ParameterObject ProductQueryDTO queryDTO) {
+// LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery();
+// wrapper.like(StrUtil.isNotEmpty(queryDTO.getProductName()),Product::getProductName,queryDTO.getProductName());
+// wrapper.eq(StrUtil.isNotEmpty(queryDTO.getParentId()),Product::getParentId,queryDTO.getParentId());
+// if (StrUtil.isNotEmpty(queryDTO.getContractCategory())&&StrUtil.equals(queryDTO.getContractCategory(), "water_house")){
+// String[] erpCodes = new String[]{"鎴跨绉熻祦","dianli","water"};
+// wrapper.in(Product::getErpCode,erpCodes);
+// return R.ok(BeanUtil.copyToList(productService.listByScope(wrapper), ProductTreeVo.class));
+// }
+// return R.ok(BeanUtil.copyToList(productService.listByScope(wrapper), ProductTreeVo.class));
+ return productService.getProductListByParentId(queryDTO);
}
/**
@@ -108,10 +113,9 @@
*/
@Operation(summary = "灞傜骇鏌ヨ" , description = "灞傜骇鏌ヨ" )
@GetMapping("/treeList" )
- //@PreAuthorize("@pms.hasPermission('business_product_view')" )
@Inner(value = false)
public R getNewsCategoryTree(@ParameterObject Product product) {
- return R.ok(productService.treeList(product.getParentId(), product.getProductName()));
+ return R.ok(productService.treeList());
}
--
Gitblit v1.9.1