From a4aa79c7f7832669aee04e315c303531e782c521 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 26 七月 2023 13:30:54 +0800
Subject: [PATCH] #甲方单位页面优化
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/CstmrController.java b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
index f4ca4a2..1f0cfd4 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -67,10 +67,23 @@
@ManagerAuth
public R page(@RequestParam(defaultValue = "1") Integer curr,
@RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String followerName,
@RequestParam(required = false) String conditionName,
@RequestParam(required = false) String condition,
@RequestParam(required = false, value = "dept_id") Long deptId,
@RequestParam(required = false, value = "user_id") Long userId){
+ List<Integer> ids = new ArrayList<>();
+ if (!Cools.isEmpty(followerName)){
+ User username = userService.selectOne(new EntityWrapper<User>().eq("username", followerName));
+ if (!Cools.isEmpty(username)){
+ List<Integer> cstmrIds = cstmrFollService.selectCstmrIdUserId(username.getId().intValue());
+ for (Integer id : cstmrIds){
+ ids.add(id);
+ }
+ }else {
+ return R.error("鏈煡璇㈠埌璺熻繘浜轰俊鎭紒");
+ }
+ }
if (!Cools.isEmpty(conditionName)){
switch (conditionName){
case "director":
@@ -84,10 +97,11 @@
}
}
- return R.ok(cstmrService.getPage1(new Page<>(curr, limit)
+ return R.ok(cstmrService.getPage3(new Page<>(curr, limit)
, getHostId()
, deptId == null ? null : String.valueOf(deptId)
, userId == null ? getUserId() : userId
+ , Cools.isEmpty(followerName) ? null : ids
, conditionName
, condition)
);
--
Gitblit v1.9.1