|
@@ -81,6 +81,12 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
|
|
|
query.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
|
|
|
query.orderByAsc(SysDepart::getDepartOrder);
|
|
|
List<SysDepart> list = this.list(query);
|
|
|
+ for (SysDepart sysDepart : list) {
|
|
|
+ if (!Check.isNull(sysDepart.getLeaderName())) {
|
|
|
+ sysDepart.setDepartName(sysDepart.getDepartName().concat("(").concat(sysDepart.getLeaderName()).concat(")"));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
// 调用wrapTreeDataToTreeList方法生成树状数据
|
|
|
List<SysDepartTreeModel> listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list);
|
|
|
return listResult;
|