diff --git a/jeecg-boot/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java b/jeecg-boot/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java index 62a1051e6d9fff53154601120dc4a2cc20fddeba..8c00e5fba40a930222336e1de864304ddc4a31f3 100644 --- a/jeecg-boot/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java +++ b/jeecg-boot/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java @@ -12,9 +12,8 @@ import lombok.extern.slf4j.Slf4j; /** * 异常处理器 * - * @author chenshun - * @email sunlightcs@gmail.com - * @date 2016年10月27日 下午10:16:19 + * @author scott + * @date 2019 */ @RestControllerAdvice @Slf4j diff --git a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java index 705c99e85467427ebc7388331afcee25a248447a..8d081fe751328f07286c10f26633d609286c52a3 100644 --- a/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java +++ b/jeecg-boot/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java @@ -1,18 +1,23 @@ package org.jeecg.modules.system.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import io.netty.util.internal.StringUtil; -import org.jeecg.modules.system.controller.FindsDepartsChildrenUtil; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.UUID; + import org.jeecg.common.util.YouBianCodeUtil; +import org.jeecg.modules.system.controller.FindsDepartsChildrenUtil; import org.jeecg.modules.system.entity.SysDepart; import org.jeecg.modules.system.mapper.SysDepartMapper; import org.jeecg.modules.system.model.SysDepartTreeModel; import org.jeecg.modules.system.service.ISysDepartService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.*; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import io.netty.util.internal.StringUtil; /** *

@@ -25,13 +30,6 @@ import java.util.*; @Service public class SysDepartServiceImpl extends ServiceImpl implements ISysDepartService { - @Autowired - private ISysDepartService sysDepartService; - - // 该集合用来存储部门下的所有数据 - private List globalList = new ArrayList<>(); - - /** * queryTreeList 对应 queryTreeList 查询所有的部门数据,以树结构形式响应给前端 */ @@ -40,8 +38,7 @@ public class SysDepartServiceImpl extends ServiceImpl query = new LambdaQueryWrapper(); query.eq(SysDepart::getDelFlag, 0); query.orderByAsc(SysDepart::getDepartOrder); - List list = sysDepartService.list(query); - globalList = list; + List list = this.list(query); // 调用wrapTreeDataToTreeList方法生成树状数据 List listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list); return listResult; @@ -68,7 +65,7 @@ public class SysDepartServiceImpl extends ServiceImpl extends ServiceImpl extends ServiceImpl parentList = sysDepartService.list(query); + List parentList = this.list(query); // 查询出父级部门 - SysDepart depart = sysDepartService.getById(parentId); + SysDepart depart = this.getById(parentId); // 获取父级部门的Code String parentCode = depart.getOrgCode(); // 根据父级部门类型算出当前部门的类型 @@ -151,7 +148,7 @@ public class SysDepartServiceImpl extends ServiceImpl>>>>"+id); boolean - * flag = sysDepartService.removeById(id); return flag; } + * flag = this.removeById(id); return flag; } */ /** @@ -163,7 +160,7 @@ public class SysDepartServiceImpl extends ServiceImpl extends ServiceImpl searhBy(String keyWord) { LambdaQueryWrapper query = new LambdaQueryWrapper(); query.like(SysDepart::getDepartName, keyWord); - List departList = this.sysDepartService.list(query); + List departList = this.list(query); List newList = new ArrayList<>(); - if(departList.size() > 0 || sysDepartService != null) { + if(departList.size() > 0) { for(SysDepart depart : departList) { newList.add(new SysDepartTreeModel(depart)); }