|
|
@@ -1,7 +1,9 @@
|
|
|
package com.flow.service.impl;
|
|
|
|
|
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.flow.common.core.exception.BaseException;
|
|
|
import com.flow.common.mybatis.constant.SqlConstant;
|
|
|
import com.flow.common.mybatis.service.impl.BaseServiceImpl;
|
|
|
@@ -50,7 +52,10 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptDao, Dept> implements D
|
|
|
|
|
|
@Override
|
|
|
public List<Dept> getTree(DeptQuery deptQuery) {
|
|
|
- List<Dept> list = this.getList(deptQuery);
|
|
|
+ //List<Dept> list = this.getList(deptQuery);
|
|
|
+ List<Dept> list = deptDao.lambdaQueryChain()
|
|
|
+ .orderByAsc(Dept::getSort)
|
|
|
+ .list();
|
|
|
//构建部门树
|
|
|
return list.stream()
|
|
|
.filter(m -> m.getPid() == 0)
|
