From 68e6e63670351165cc3c9aede5d7a1b5b7ba3fde Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 14 九月 2023 14:22:39 +0800
Subject: [PATCH] #CstmrId$
---
src/main/java/com/zy/crm/manager/controller/PriQuoteBudgetController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 7bfd835..c378eaf 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));
}
@@ -81,9 +82,13 @@
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
boolean signUserId = false;
boolean signDeptId = false;
+ boolean signHostId = false;
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().equals("dept_id")){
signDeptId = true;
+ if (String.valueOf(entry.getValue()).equals("19")){
+ signHostId = true;
+ }
}
}
for (Map.Entry<String, Object> entry : map.entrySet()){
@@ -105,6 +110,9 @@
}
if (!signUserId && !signDeptId){
wrapper.eq("user_id", getUserId());
+ }
+ if (signHostId){
+ wrapper.or().eq("host_id",1);
}
}
@@ -246,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