From 108e2fc9543ce11e7069c4b4fc10d2f05006333b Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 02 十一月 2023 12:47:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/service/impl/PlanServiceImpl.java | 4 ++--
src/main/resources/mapper/PlanMapper.xml | 10 ++++++----
src/main/java/com/zy/crm/manager/controller/PlanController.java | 3 +++
src/main/java/com/zy/crm/manager/service/PlanService.java | 2 +-
src/main/java/com/zy/crm/manager/mapper/PlanMapper.java | 2 +-
5 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PlanController.java b/src/main/java/com/zy/crm/manager/controller/PlanController.java
index 32f090a..08a2175 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -89,6 +89,7 @@
@RequestParam(required = false) String condition,
@RequestParam(required = false, value = "dept_id") Long deptId,
@RequestParam(required = false, value = "user_id") Long userId) {
+ Long director = null;
if (deptId==null && userId == null){
if (getRole().getId()==3){
userId = getUserId();
@@ -96,12 +97,14 @@
deptId = getDeptId();
userId = null;
}
+ director = getUserId();
}
return R.ok(planService.getPage(new Page<>(curr, limit)
, getHostId()
, deptId == null ? null : String.valueOf(deptId)
, userId
+ , director
, condition)
);
}
diff --git a/src/main/java/com/zy/crm/manager/mapper/PlanMapper.java b/src/main/java/com/zy/crm/manager/mapper/PlanMapper.java
index 674fa43..f4b638a 100644
--- a/src/main/java/com/zy/crm/manager/mapper/PlanMapper.java
+++ b/src/main/java/com/zy/crm/manager/mapper/PlanMapper.java
@@ -24,6 +24,6 @@
Plan selectPlanByNewestUuid(@Param("hostId") Long hostId);
- List<Plan> listByPage(Page<Plan> page, @Param("hostId")Long hostId, @Param("deptId") String deptId, @Param("userId") Long userId , @Param("condition") String condition);
+ List<Plan> listByPage(Page<Plan> page, @Param("hostId")Long hostId, @Param("deptId") String deptId, @Param("userId") Long userId ,@Param("director")Long director, @Param("condition") String condition);
}
diff --git a/src/main/java/com/zy/crm/manager/service/PlanService.java b/src/main/java/com/zy/crm/manager/service/PlanService.java
index f2d03f6..75f4443 100644
--- a/src/main/java/com/zy/crm/manager/service/PlanService.java
+++ b/src/main/java/com/zy/crm/manager/service/PlanService.java
@@ -17,6 +17,6 @@
String getUuid(Long hostId);
- Page<Plan> getPage(Page<Plan> page, Long hostId, String deptId, Long userId, String condition);
+ Page<Plan> getPage(Page<Plan> page, Long hostId, String deptId, Long userId,Long direcote, String condition);
}
diff --git a/src/main/java/com/zy/crm/manager/service/impl/PlanServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/PlanServiceImpl.java
index 7ea271d..7577400 100644
--- a/src/main/java/com/zy/crm/manager/service/impl/PlanServiceImpl.java
+++ b/src/main/java/com/zy/crm/manager/service/impl/PlanServiceImpl.java
@@ -61,8 +61,8 @@
}
@Override
- public Page<Plan> getPage(Page<Plan> page, Long hostId, String deptId, Long userId, String condition) {
- return page.setRecords(baseMapper.listByPage(page, hostId, deptId, userId, condition));
+ public Page<Plan> getPage(Page<Plan> page, Long hostId, String deptId, Long userId, Long director,String condition) {
+ return page.setRecords(baseMapper.listByPage(page, hostId, deptId, userId,director, condition));
}
private String getNextUuid(Long hostId) {
diff --git a/src/main/resources/mapper/PlanMapper.xml b/src/main/resources/mapper/PlanMapper.xml
index cfb30cd..a8713e2 100644
--- a/src/main/resources/mapper/PlanMapper.xml
+++ b/src/main/resources/mapper/PlanMapper.xml
@@ -85,11 +85,10 @@
(
<if test="userId != null and userId != ''">
user_id = #{userId}
+ or
+ director = #{userId}
+ or
</if>
- <if test="userId == null or userId == ''">
- user_id is not null
- </if>
- or
mp.id in
(
select
@@ -111,6 +110,9 @@
or mp.planner like concat('%',#{condition},'%')
)
</if>
+ <if test="director != null and director != ''">
+ or mp.director = #{director}
+ </if>
ORDER BY mp.create_time DESC
</select>
--
Gitblit v1.9.1