..
This commit is contained in:
+19
-7
@@ -1,11 +1,16 @@
|
||||
package com.budwk.app.zhgh.activity.basic.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.lang.tree.Tree;
|
||||
import cn.hutool.core.lang.tree.TreeNode;
|
||||
import cn.hutool.core.lang.tree.TreeUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.budwk.app.base.page.Pagination;
|
||||
import com.budwk.app.base.param.PageForm;
|
||||
import com.budwk.app.base.result.Result;
|
||||
import com.budwk.app.base.service.BaseService;
|
||||
import com.budwk.app.sys.models.Sys_unit;
|
||||
import com.budwk.app.zhgh.activity.basic.models.ActivityBasicUnit;
|
||||
import org.nutz.aop.interceptor.ioc.TransAop;
|
||||
import org.nutz.dao.Chain;
|
||||
@@ -68,14 +73,21 @@ public class ActivityBasicUnitController {
|
||||
@At
|
||||
@SaCheckPermission("activity.basic.unit")
|
||||
public Result tree() {
|
||||
List list = new ArrayList();
|
||||
ActivityBasicUnit parentId = dao.fetch(ActivityBasicUnit.class, Cnd.where("id", "=", "1"));
|
||||
if (parentId != null) {
|
||||
parentId.setChild(child(parentId.getId()));
|
||||
list.add(parentId);
|
||||
return Result.success().addData(list);
|
||||
// List list = new ArrayList();
|
||||
// ActivityBasicUnit parentId = dao.fetch(ActivityBasicUnit.class, Cnd.where("id", "=", "1"));
|
||||
// if (parentId != null) {
|
||||
// parentId.setChild(child(parentId.getId()));
|
||||
// list.add(parentId);
|
||||
// return Result.success().addData(list);
|
||||
// }
|
||||
|
||||
List<ActivityBasicUnit> list = dao.query(ActivityBasicUnit.class, Cnd.NEW());
|
||||
List<TreeNode<String>> nodeList = CollUtil.newArrayList();
|
||||
for (int i = 0; i < list.size(); i++) {
|
||||
nodeList.add(new TreeNode<>(list.get(i).getId(), list.get(i).getParentId(), list.get(i).getName(), i));
|
||||
}
|
||||
return Result.success();
|
||||
List<Tree<String>> treeList = TreeUtil.build(nodeList, "1");
|
||||
return Result.success(treeList);
|
||||
}
|
||||
|
||||
private List<ActivityBasicUnit> child(String parentId) {
|
||||
|
||||
Reference in New Issue
Block a user