From 4278843c6101eefe86f03ba516d72febd3218c8c Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 27 二月 2025 16:27:22 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppDepartmentController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 8d37177..d5f48d4 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
@@ -93,8 +93,10 @@
@ApiOperation("获取医院监管列表")
@PostMapping("/hospita/list")
- public R<List<SysDepartment>> list(String name,Long areaId) {
- List<SysDepartment> list = sysDepartmentService.lambdaQuery().eq(areaId!=null,SysDepartment::getParentId,areaId).like(name!=null,SysDepartment::getDepartmentName,name).eq(SysDepartment::getOrgType, 2).list();
+ public R<List<SysDepartment>> list(String name, Long areaId) {
+ Long departmentId = SecurityUtils.getLoginUser().getUser().getDepartmentId();
+ SysDepartment byId = sysDepartmentService.getById(departmentId);
+ List<SysDepartment> list = sysDepartmentService.lambdaQuery().likeRight(SysDepartment::getTreeCode, byId.getTreeCode()).eq(areaId != null, SysDepartment::getParentId, areaId).like(name != null, SysDepartment::getDepartmentName, name).eq(SysDepartment::getOrgType, 2).list();
for (SysDepartment sysDepartment : list) {
//获取医院暂存间信息
MwStagingRoom one = roomService.lambdaQuery().eq(MwStagingRoom::getDepartmentId, sysDepartment.getId()).one();
@@ -109,7 +111,6 @@
sysDepartment.setMaxCapacity(one.getMaxCapacity());
sysDepartment.setNowCapacity(count.intValue());
sysDepartment.setPercentage(percentage);
-
}
return R.ok(list);
}
--
Gitblit v1.7.1