From c5c284896ce6428cffc5092e9cdef4fefc23409f Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 18 九月 2026 17:12:49 +0800
Subject: [PATCH] feat: 石煤机客商产品查询处理 合同推送新增选商方式和是否关联交易
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 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 a19180b..6994108 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
@@ -12,6 +12,7 @@
import com.by4cloud.platformx.business.dto.ProductAddDTO;
import com.by4cloud.platformx.business.dto.ProductQueryDTO;
import com.by4cloud.platformx.business.dto.SyncProductDTO;
+import com.by4cloud.platformx.business.entity.BusinessCustomer;
import com.by4cloud.platformx.business.vo.ProductExcelVO;
import com.by4cloud.platformx.business.vo.ProductTreeVo;
import com.by4cloud.platformx.common.core.util.R;
@@ -20,6 +21,8 @@
import com.by4cloud.platformx.business.entity.Product;
import com.by4cloud.platformx.business.service.ProductService;
import com.by4cloud.platformx.common.security.annotation.Inner;
+import com.by4cloud.platformx.common.security.util.SecurityUtils;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -50,6 +53,15 @@
private final ProductService productService;
+ @Value("${dept.smj}")
+ private String smj;
+
+ @Value("${dept.smjsc}")
+ private String smjsc;
+
+ @Value("${dept.smjzt}")
+ private String smjzt;
+
/**
* 鍒嗛〉鏌ヨ
* @param page 鍒嗛〉瀵硅薄
@@ -60,6 +72,32 @@
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('business_product_view')" )
public R getProductPage(@ParameterObject Page page, @ParameterObject Product product) {
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
+ LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(product.getParentId()!=null,Product::getParentId,product.getParentId());
+ wrapper.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName());
+ wrapper.like(StrUtil.isNotEmpty(product.getMainCode()),Product::getMainCode,product.getMainCode());
+ wrapper.like(StrUtil.isNotEmpty(product.getErpCode()),Product::getErpCode,product.getErpCode());
+ List<String> smjList = new ArrayList<>();
+ smjList.add(smj);
+ smjList.add(smjsc);
+ smjList.add(smjzt);
+ wrapper.in(Product::getCompId, smjList);
+ wrapper.orderByDesc(Product::getCreateTime);
+ Page<Product> page1 = productService.page(page, wrapper);
+ List<Product> list = page1.getRecords();
+ for(Product product1 : list){
+ Product parent = productService.getById(product1.getParentId());
+ if(parent==null){
+ product1.setParentName("鏍圭骇浜у搧");
+ }else {
+ product1.setParentName(parent.getProductName());
+ }
+ }
+ page1.setRecords(list);
+ return R.ok(page1);
+ }
LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery();
wrapper.eq(product.getParentId()!=null,Product::getParentId,product.getParentId());
wrapper.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName());
--
Gitblit v1.9.1