From 5fcaa5b9d0f5b84f8a25f3e2e8f27c3885d8710e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 08 十一月 2022 11:54:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 40 ++++++++++++----------------------------
1 files changed, 12 insertions(+), 28 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 8340a86..8382466 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -56,35 +56,19 @@
return R.ok(cstmrService.selectById(String.valueOf(id)));
}
- @RequestMapping(value = "/cstmr/list/auth")
+ @RequestMapping(value = "/cstmr/page/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
- EntityWrapper<Cstmr> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- hostEq(wrapper);
- allLike(Cstmr.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
- wrapper.orderBy("create_time", false);
- }
- if (!Cools.isEmpty(param.get("dept_id"))) {
- return R.ok(cstmrService.getPage(new Page<>(curr, limit)
- , getHostId()
- , String.valueOf(param.get("dept_id"))
- , condition)
- );
- } else {
- if (Cools.isEmpty(param.get("user_id"))) {
- wrapper.andNew();
- wrapper.eq("user_id", getUserId());
- }
- return R.ok(cstmrService.selectPage(new Page<>(curr, limit), wrapper));
- }
+ public R page(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String condition,
+ @RequestParam(required = false, value = "dept_id") Long deptId,
+ @RequestParam(required = false, value = "user_id") Long userId){
+ return R.ok(cstmrService.getPage(new Page<>(curr, limit)
+ , getHostId()
+ , deptId == null ? null : String.valueOf(deptId)
+ , userId == null ? getUserId() : userId
+ , condition)
+ );
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
--
Gitblit v1.9.1