From 8745b76acfd45eadd720d7ce6d87c77e6e0682b9 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 06 九月 2022 12:46:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/java/zy/cloud/wms/common/controller/SaleProjectController.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/controller/SaleProjectController.java b/src/main/java/zy/cloud/wms/common/controller/SaleProjectController.java
index 09f010e..b5258b2 100644
--- a/src/main/java/zy/cloud/wms/common/controller/SaleProjectController.java
+++ b/src/main/java/zy/cloud/wms/common/controller/SaleProjectController.java
@@ -16,6 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.manager.entity.Cstmr;
+import zy.cloud.wms.manager.entity.Item;
import zy.cloud.wms.manager.service.CstmrService;
import zy.cloud.wms.system.entity.User;
import zy.cloud.wms.system.service.UserService;
@@ -45,9 +46,11 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
EntityWrapper<SaleProject> wrapper = new EntityWrapper<>();
excludeTrash(param);
+ allLike(SaleProject.class, param.keySet(), wrapper, condition);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
if (getUserId() != 9527){
--
Gitblit v1.9.1