From aded6d51dd8cc3b7d2b5a9a0be54378c5b2ee924 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 15:11:15 +0800
Subject: [PATCH] merge
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppDepartmentController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppDepartmentController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppDepartmentController.java
index d87f1e5..16f31b0 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppDepartmentController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppDepartmentController.java
@@ -54,9 +54,15 @@
@PostMapping("/regionTree")
@ApiImplicitParam(name = "keyword", value = "关键字", required = false)
public R<List<SysDepartmentVO>> getRegionTree(@RequestParam(required = false) String keyword) {
- return R.ok(sysDepartmentService.getRegionTree(keyword));
+ return R.ok(sysDepartmentService.getRegionTree1(keyword));
}
+ @ApiOperation("获取单位详情")
+ @PostMapping("/detail")
+ public R<SysDepartment> getRegionTree(@RequestParam(required = true) Long id) {
+ return R.ok(sysDepartmentService.getById(id));
+
+ }
/**
* 获取区域树
*
@@ -76,7 +82,7 @@
for (SysDepartment sysDepartment : list) {
//获取医院暂存间信息
MwStagingRoom one = roomService.lambdaQuery().eq(MwStagingRoom::getDepartmentId, sysDepartment.getId()).one();
- if (one != null) {
+ if (one == null) {
continue;
}
//获取存了多少数量
--
Gitblit v1.7.1