c-zhangr1/zhgh_njnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

..

Browse Source
This commit is contained in:
server
2025-06-11 16:19:38 +08:00
parent a1ecc704aa
commit 1f763c6f5f
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicUnitController.java
+19 -7
View File
@@ -1,11 +1,16 @@
package com.budwk.app.zhgh.activity.basic.controller; package com.budwk.app.zhgh.activity.basic.controller;
import cn.dev33.satoken.annotation.SaCheckPermission; 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 cn.hutool.core.util.StrUtil;
import com.budwk.app.base.page.Pagination; import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.param.PageForm; import com.budwk.app.base.param.PageForm;
import com.budwk.app.base.result.Result; import com.budwk.app.base.result.Result;
import com.budwk.app.base.service.BaseService; 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 com.budwk.app.zhgh.activity.basic.models.ActivityBasicUnit;
import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Chain; import org.nutz.dao.Chain;
@@ -68,14 +73,21 @@ public class ActivityBasicUnitController {
@At @At
@SaCheckPermission("activity.basic.unit") @SaCheckPermission("activity.basic.unit")
public Result tree() { public Result tree() {
List list = new ArrayList(); // List list = new ArrayList();
ActivityBasicUnit parentId = dao.fetch(ActivityBasicUnit.class, Cnd.where("id", "=", "1")); // ActivityBasicUnit parentId = dao.fetch(ActivityBasicUnit.class, Cnd.where("id", "=", "1"));
if (parentId != null) { // if (parentId != null) {
parentId.setChild(child(parentId.getId())); // parentId.setChild(child(parentId.getId()));
list.add(parentId); // list.add(parentId);
return Result.success().addData(list); // 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) { private List<ActivityBasicUnit> child(String parentId) {