From c29811a8e8e6fe8166283f498609f84ca9533249 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 21 三月 2025 15:24:13 +0800
Subject: [PATCH] 管理后台bug修改
---
medicalWaste-system/src/main/resources/mapper/system/MwContractMapper.xml | 1 +
medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java | 3 +++
medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysDepartmentController.java | 2 +-
3 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysDepartmentController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysDepartmentController.java
index ec4a12f..1ceb52a 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysDepartmentController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysDepartmentController.java
@@ -55,7 +55,7 @@
*
* @return
*/
- @ApiOperation(value = "获取全部/区域/医疗机构/处置单位/监管单位树-搜索框用", notes = "0：全部 1：区域 2：医疗机构 3：处置单位 4：监管单位")
+ @ApiOperation(value = "获取全部/区域/医疗机构/处置单位/监管单位树-搜索框用", notes = "0：全部 1：区域 2：医疗机构 3：处置单位 4：监管单位 5：医疗机构、监管单位")
@GetMapping("/departmentSearchTree")
@ApiImplicitParam(name = "type", value = "查询类型", required = true)
public R<List<SysDepartmentVO>> getDepartmentSearchTree(@RequestParam(value = "type", required = true) @NotNull(message = "类型不能为空") Integer type) {
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
index 3ce68a4..dc5c49e 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
@@ -89,6 +89,9 @@
case 4:
childrenMap = getChildrenDepartmentByOrgType(myDepartment, Arrays.asList(DepartmentEnum.REGION.getCode(), DepartmentEnum.REGULATORY_UNIT.getCode()));
break;
+ case 5:
+ childrenMap = getChildrenDepartmentByOrgType(myDepartment, Arrays.asList(DepartmentEnum.REGION.getCode(), DepartmentEnum.MEDICAL_INSTITUTION.getCode(), DepartmentEnum.DISPOSAL_UNIT.getCode()));
+ break;
default:
childrenMap = getChildrenDepartmentByOrgType(myDepartment, null);
}
diff --git a/medicalWaste-system/src/main/resources/mapper/system/MwContractMapper.xml b/medicalWaste-system/src/main/resources/mapper/system/MwContractMapper.xml
index 7938e69..b66ee80 100644
--- a/medicalWaste-system/src/main/resources/mapper/system/MwContractMapper.xml
+++ b/medicalWaste-system/src/main/resources/mapper/system/MwContractMapper.xml
@@ -67,6 +67,7 @@
AND MC.CONTRACT_NAME LIKE CONCAT('%',#{query.contractName},'%')
</if>
</where>
+ ORDER BY MC.CREATE_TIME DESC
</select>
<select id="queryListTerminationDateBeforeNow" resultType="com.sinata.system.domain.vo.MwContractVO"
parameterType="java.util.Date">
--
Gitblit v1.7.1