From c0f194e692337993a996baf6a153598a21876ee1 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 21 九月 2023 15:21:10 +0800
Subject: [PATCH] productWebsocket中属性加上ebabled
---
src/main/java/com/whyc/service/ProductService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductService.java b/src/main/java/com/whyc/service/ProductService.java
index bb874e9..662529f 100644
--- a/src/main/java/com/whyc/service/ProductService.java
+++ b/src/main/java/com/whyc/service/ProductService.java
@@ -58,7 +58,7 @@
private ProductLockLogService productLockLogService;
//鏌ヨ鍑烘墍鏈夌殑浜у搧淇℃伅(鍒嗛〉鍔犳ā绯婃煡璇�<浜у搧鐨勭紪鐮侊紝鍨嬪彿锛屽悕瀛楋紝瀹氬埗琛ㄧ紪鍙�>
- public Response getAllProduct(String subCode,String parentCode, String parentName, String parentModel, String customCode, int pageCurr, int pageSize) {
+ public Response getAllProduct(String subCode,String parentCode, String parentName, String parentModel, String customCode,Integer enabled, int pageCurr, int pageSize) {
PageHelper.startPage(pageCurr,pageSize);
/*QueryWrapper wrapper=new QueryWrapper();
if(parentCode!=null){
@@ -79,15 +79,15 @@
}
wrapper.orderByAsc("id");
List list=mapper.selectList(wrapper);*/
- List<Product> list=mapper.getAllProduct(subCode,parentCode,parentName,parentModel,customCode);
- list.stream().forEach(product -> {
+ List<Product> list=mapper.getAllProduct(subCode,parentCode,parentName,parentModel,customCode,enabled);
+ /*list.stream().forEach(product -> {
//1.鏌ヨ鏄惁瀛樺湪璇ヨ褰�
QueryWrapper qwrapper=new QueryWrapper();
qwrapper.eq("id",product.getId());
qwrapper.last("limit 1");
ProductHistory pHis=hisMapper.selectOne(qwrapper);
product.setEnabled(pHis.getEnabled());
- });
+ });*/
PageInfo pageInfo=new PageInfo(list);
return new Response().setII(1,list.size()>0,pageInfo,"杩斿洖浜у搧淇℃伅");
}
--
Gitblit v1.9.1