From 26ebf71529e5ee4f70c4ad3ed52ea5e59c1b46e5 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 09 十月 2023 14:02:30 +0800
Subject: [PATCH] #核价相关
---
src/main/java/com/zy/crm/manager/controller/PriSalesController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PriSalesController.java b/src/main/java/com/zy/crm/manager/controller/PriSalesController.java
index 8c33ab4..cea1345 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriSalesController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriSalesController.java
@@ -70,10 +70,11 @@
@RequestParam Map<String, Object> param){
EntityWrapper<PriSales> 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("allopen"));
+// wrapper.in("member_id", getUserRoleBelongsToUserId("allopen"));
excludeTrash(param);
convert(param, wrapper);
allLike(PriSales.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(priSalesService.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);
}
}
@@ -144,7 +152,7 @@
initNames.add("鎻愪氦浜у搧璐圭敤鏄庣粏");
initNames.add("閮ㄩ棬缁忕悊瀹℃牳");
initNames.add("涓氬姟鍛樼‘璁�");
- priSales.setSettleMsg(JSON.toJSONString(SettleDto.initSalesPricing(manager,getUser(),initNames,3)));
+ priSales.setSettleMsg(JSON.toJSONString(SettleDto.initSalesPricing(manager,getUser(),getUser(),initNames,3)));
//璁剧疆椤圭洰娴佺▼
plan.setStep(3);
@@ -245,7 +253,7 @@
public R query(String condition) {
EntityWrapper<PriSales> wrapper = new EntityWrapper<>();
wrapper.like("id", condition);
- wrapper.in("member_id", getUserRoleBelongsToUserId("allopen"));
+ wrapper.in("user_id", getUserRoleBelongsToUserId("allopen"));
Page<PriSales> page = priSalesService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (PriSales priSales : page.getRecords()){
--
Gitblit v1.9.1