From 6ec40d5a0c145ccffd1a28841f1c732f764e3e44 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 20 Apr 2020 17:32:00 +0800
Subject: [PATCH] 添加 部门的拦截的功能
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysCompanyServiceImpl.java | 78 +++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysCompanyServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysCompanyServiceImpl.java
index 6cf4234..fb8302b 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysCompanyServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysCompanyServiceImpl.java
@@ -43,47 +43,47 @@
* @return
*/
@Override
- public PageResult<SysCompanyVo> findList(Map<String, Object> params){
+ public PageResult findList(Map<String, Object> params){
Page<SysCompany> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
List<SysCompany> list = baseMapper.findList(page, params);
- List<SysCompanyVo> listVo=new ArrayList<>();
- list.forEach(e -> {
- SysCompanyVo vo=new SysCompanyVo();
- BeanCopier beanCopier = BeanCopier.create(SysCompany.class, SysCompanyVo.class, false);
- beanCopier.copy(e,vo,null);
- if(vo.getCompanyArea()!=null){
- SysArea byId = sysAreaService.getById(vo.getCompanyArea());
- if(byId.getAreaLeveltype()==XIAN){
- vo.setXianId(byId.getId());
- vo.setXian(byId.getAreaName());
- SysArea shi = sysAreaService.getById(byId.getAreaParentId());
- if(shi!=null){
- vo.setShi(shi.getAreaName());
- vo.setShiId(shi.getId());
- SysArea sheng = sysAreaService.getById(shi.getAreaParentId());
- if (sheng != null) {
- vo.setSheng(sheng.getAreaName());
- vo.setShengId(sheng.getId());
- }
- }
- }
- if(byId.getAreaLeveltype()==SHI){
- vo.setShi(byId.getAreaName());
- vo.setShiId(byId.getId());
- SysArea sheng = sysAreaService.getById(byId.getAreaParentId());
- if (sheng != null) {
- vo.setSheng(sheng.getAreaName());
- vo.setShengId(sheng.getId());
- }
- }
- if(byId.getAreaLeveltype()==SHENG){
- vo.setSheng(byId.getAreaName());
- vo.setShengId(byId.getId());
- }
- }
- listVo.add(vo);
- });
- return PageResult.<SysCompanyVo>builder().data(listVo).code(0).count(page.getTotal()).build();
+// List<SysCompanyVo> listVo=new ArrayList<>();
+// list.forEach(e -> {
+// SysCompanyVo vo=new SysCompanyVo();
+// BeanCopier beanCopier = BeanCopier.create(SysCompany.class, SysCompanyVo.class, false);
+// beanCopier.copy(e,vo,null);
+// if(vo.getCompanyArea()!=null){
+// SysArea byId = sysAreaService.getById(vo.getCompanyArea());
+// if(byId.getAreaLeveltype()==XIAN){
+// vo.setXianId(byId.getId());
+// vo.setXian(byId.getAreaName());
+// SysArea shi = sysAreaService.getById(byId.getAreaParentId());
+// if(shi!=null){
+// vo.setShi(shi.getAreaName());
+// vo.setShiId(shi.getId());
+// SysArea sheng = sysAreaService.getById(shi.getAreaParentId());
+// if (sheng != null) {
+// vo.setSheng(sheng.getAreaName());
+// vo.setShengId(sheng.getId());
+// }
+// }
+// }
+// if(byId.getAreaLeveltype()==SHI){
+// vo.setShi(byId.getAreaName());
+// vo.setShiId(byId.getId());
+// SysArea sheng = sysAreaService.getById(byId.getAreaParentId());
+// if (sheng != null) {
+// vo.setSheng(sheng.getAreaName());
+// vo.setShengId(sheng.getId());
+// }
+// }
+// if(byId.getAreaLeveltype()==SHENG){
+// vo.setSheng(byId.getAreaName());
+// vo.setShengId(byId.getId());
+// }
+// }
+// listVo.add(vo);
+// });
+ return PageResult.<SysCompany>builder().data(list).code(0).count(page.getTotal()).build();
}
/**
--
Gitblit v1.8.0