From 03d3cd458fc0dee8859564073ae3e754df228e2f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 27 十一月 2023 14:17:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java b/src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java
index c69e126..010f694 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java
@@ -70,10 +70,11 @@
@RequestParam Map<String, Object> param){
EntityWrapper<PriQuoteBudget> wrapper = new EntityWrapper<>();
wrapper.setSqlSelect("id,title,create_time as createTime,settle,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,update_user_id as updateUserId,update_time as updateTime,in_order_num as inOrderNum,member_id as memberId");
- wrapper.in("member_id", getUserRoleBelongsToUserId());
+// wrapper.in("member_id", getUserRoleBelongsToUserId());
excludeTrash(param);
convert(param, wrapper);
allLike(PriQuoteBudget.class, param.keySet(), wrapper, condition);
+ wrapper.or().eq("member_id",getUserId());
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(priQuoteBudgetService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -152,7 +153,7 @@
initNames.add("鎻愪氦鎶ヤ环棰勭畻鍗�");
initNames.add("閮ㄩ棬缁忕悊瀹℃牳");
initNames.add("涓氬姟鍛樼‘璁�");
- priQuoteBudget.setSettleMsg(JSON.toJSONString(SettleDto.initSalesPricing(manager,getUser(),initNames,3)));
+ priQuoteBudget.setSettleMsg(JSON.toJSONString(SettleDto.initSalesPricing(manager,getUser(),getUser(),initNames,3)));
//璁剧疆椤圭洰娴佺▼
plan.setStep(4);
@@ -253,7 +254,7 @@
public R query(String condition) {
EntityWrapper<PriQuoteBudget> wrapper = new EntityWrapper<>();
wrapper.like("id", condition);
- wrapper.in("member_id", getUserRoleBelongsToUserId());
+ wrapper.in("user_id", getUserRoleBelongsToUserId());
Page<PriQuoteBudget> page = priQuoteBudgetService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (PriQuoteBudget priQuoteBudget : page.getRecords()){
--
Gitblit v1.9.1