From ced9e764059ea2b4bbc8a9fb6aef862d5dab9bd1 Mon Sep 17 00:00:00 2001 From: 王彪总 Date: Tue, 19 May 2026 19:38:32 +0800 Subject: [PATCH] config(servers): 更新服务器配置中的域名地址 --- .gitignore | 12 ++++++++++++ urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/DeptController.java | 16 ++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e625a99..4bf7246 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,15 @@ application-my.yaml /urbanops-ui-app/unpackage/ **/.DS_Store old/ +/.claudeignore +/docs/all_test.html +/docs/ppt-assets/animations.css +/docs/ppt-assets/base.css +/CLAUDE.md +/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ErrorCodeConstants_手动操作.java +/docs/ppt-assets/fonts.css +/docs/ppt-assets/runtime.js +/.claude/settings.local.json +/docs/ppt-assets/style.css +/docs/urbanops-architecture-ppt.html +/docs/urbanops-tech-sharing.html diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/DeptController.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/DeptController.java index af97fc2..4e0f116 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/DeptController.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/DeptController.java @@ -19,12 +19,11 @@ import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; import jakarta.validation.Valid; -import java.util.HashMap; -import java.util.Map; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; +import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertSet; @Tag(name = "管理后台 - 部门") @RestController @@ -129,8 +128,13 @@ public class DeptController { @Operation(summary = "查询所有组织") @GetMapping("/queryAllDeptList") @PermitAll - public Map queryAllDeptList() { - List sysDepts = deptService.getSubDeptAllList(); + public Map queryAllDeptList( @RequestParam(required = false) Long deptId) { + List sysDepts = new ArrayList<>(); + if(deptId != null){ + sysDepts = deptService.getChildDeptList(deptId); + }else { + sysDepts = deptService.getDeptAllList(); + } List> deptResps = sysDepts.stream().map(sysDept -> { Map deptMap = new HashMap<>(); deptMap.put("deptCode", sysDept.getId() + ""); @@ -140,7 +144,7 @@ public class DeptController { deptMap.put("orderNum", sysDept.getSort()); return deptMap; }).collect(Collectors.toList()); - + // 构建返回格式 Map result = new HashMap<>(); result.put("msg", "操作成功"); -- libgit2 0.21.4