From 0fd3f919fe4a43907667d704d4b78be8ab855f85 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 14 九月 2023 14:10:47 +0800
Subject: [PATCH] #下级流程获取上级流程条件member_id==>user_id
---
src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
index a5f868f..b438822 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
@@ -81,10 +81,11 @@
@RequestParam Map<String, Object> param){
EntityWrapper<PriOnline2> wrapper = new EntityWrapper<>();
wrapper.setSqlSelect("id,title,create_time as createTime,filepath,settle,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,dept_id as deptId,status,update_time as updateTime,check_data as checkData,update_user_id as updateUserId,member_id as memberId");
- wrapper.in("member_id", getUserRoleBelongsToUserId("allopen"));
+// wrapper.in("member_id", getUserRoleBelongsToUserId("allopen"));
excludeTrash(param);
convert(param, wrapper);
allLike(PriOnline2.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(priOnline2Service.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -331,7 +332,7 @@
public R query(String condition) {
EntityWrapper<PriOnline2> wrapper = new EntityWrapper<>();
wrapper.like("order_num", condition);
- wrapper.in("member_id", getUserRoleBelongsToUserId("allopen"));
+ wrapper.in("user_id", getUserRoleBelongsToUserId("allopen"));
Page<PriOnline2> page = priOnline2Service.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (PriOnline2 priOnline2 : page.getRecords()){
--
Gitblit v1.9.1