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/service/CstmrService.java | 2 src/main/java/com/zy/crm/manager/controller/CstmrController.java | 40 ++++++-------------- src/main/webapp/static/js/cstmr/cstmr.js | 2 src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java | 4 +- src/main/resources/mapper/CstmrMapper.xml | 11 ++++- src/main/java/com/zy/crm/manager/mapper/CstmrMapper.java | 2 6 files changed, 26 insertions(+), 35 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){ diff --git a/src/main/java/com/zy/crm/manager/mapper/CstmrMapper.java b/src/main/java/com/zy/crm/manager/mapper/CstmrMapper.java index 2f28610..5c4357a 100644 --- a/src/main/java/com/zy/crm/manager/mapper/CstmrMapper.java +++ b/src/main/java/com/zy/crm/manager/mapper/CstmrMapper.java @@ -17,6 +17,6 @@ Cstmr selectCstmrByNewestUuid(@Param("hostId") Long hostId); - List<Cstmr> listByPage(Page page, @Param("hostId")Long hostId, @Param("deptId") String deptId, @Param("condition") String condition); + List<Cstmr> listByPage(Page<Cstmr> page, @Param("hostId")Long hostId, @Param("deptId") String deptId, @Param("userId") Long userId ,@Param("condition") String condition); } diff --git a/src/main/java/com/zy/crm/manager/service/CstmrService.java b/src/main/java/com/zy/crm/manager/service/CstmrService.java index c81a911..62ff4da 100644 --- a/src/main/java/com/zy/crm/manager/service/CstmrService.java +++ b/src/main/java/com/zy/crm/manager/service/CstmrService.java @@ -10,6 +10,6 @@ String getUuid(Long hostId); - Page<Cstmr> getPage(Page page, Long hostId, String deptId, String condition); + Page<Cstmr> getPage(Page<Cstmr> page, Long hostId, String deptId, Long userId, String condition); } diff --git a/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java index 598565b..389166c 100644 --- a/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java +++ b/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java @@ -40,8 +40,8 @@ } @Override - public Page<Cstmr> getPage(Page page, Long hostId, String deptId, String condition) { - return page.setRecords(baseMapper.listByPage(page, hostId, deptId, condition)); + public Page<Cstmr> getPage(Page<Cstmr> page, Long hostId, String deptId, Long userId, String condition) { + return page.setRecords(baseMapper.listByPage(page, hostId, deptId, userId, condition)); } diff --git a/src/main/resources/mapper/CstmrMapper.xml b/src/main/resources/mapper/CstmrMapper.xml index 35ca255..b7cbd48 100644 --- a/src/main/resources/mapper/CstmrMapper.xml +++ b/src/main/resources/mapper/CstmrMapper.xml @@ -57,8 +57,15 @@ FROM man_cstmr mc LEFT JOIN sys_dept sd ON mc.dept_id = sd.id WHERE 1=1 - AND (CHARINDEX(','+#{deptId}+',', ','+sd.path+',') > 0 OR sd.id = #{deptId}) - <if test="hostId != null and hostId != ''"> + <choose> + <when test="deptId != null and deptId != ''"> + AND (CHARINDEX(','+#{deptId}+',', ','+sd.path+',') > 0 OR sd.id = #{deptId}) + </when> + <otherwise> + AND mc.user_id = #{userId} + </otherwise> + </choose> + <if test="hostId != null"> and mc.host_id = #{hostId} </if> <if test="condition != null and condition != ''"> diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js index d3723c2..d53d7a0 100644 --- a/src/main/webapp/static/js/cstmr/cstmr.js +++ b/src/main/webapp/static/js/cstmr/cstmr.js @@ -127,7 +127,7 @@ tableIns = table.render({ elem: '#cstmr', headers: {token: localStorage.getItem('token')}, - url: baseUrl+'/cstmr/list/auth', + url: baseUrl+'/cstmr/page/auth', page: true, limit: 15, limits: [15, 30, 50, 100, 200, 500], -- Gitblit v1.9.1