From 1cbc3456ff88a4a2a3c41cdc969f8a2d738b654c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 14:03:12 +0800
Subject: [PATCH] 机构详情优化
---
drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml | 19 +++++++++++++++++++
drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.java | 8 ++++++++
drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java | 5 +++++
drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java | 4 ++--
drone-service/drone-system/src/main/java/org/sxkj/system/service/IDeptService.java | 8 ++++++++
5 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java b/drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java
index 3225c91..616a110 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java
@@ -102,8 +102,8 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入dept")
public R<DeptVO> detail(Dept dept) {
- Dept detail = deptService.getOne(Condition.getQueryWrapper(dept));
- return R.data(DeptWrapper.build().entityVO(detail));
+ DeptVO detail = deptService.getDetailWithAreaName(dept);
+ return R.data(detail);
}
/**
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.java b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.java
index d26685e..15816be 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.java
@@ -145,4 +145,12 @@
* @return
*/
List<DeptExcel> exportDept(DeptExportParam deptExportParam);
+
+ /**
+ * 获取部门详情（包含区域名称）
+ *
+ * @param dept 部门对象，包含查询条件
+ * @return 部门详情VO，包含区域名称
+ */
+ DeptVO getDetailWithAreaName(@Param("dept") Dept dept);
}
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml
index 9f99dac..a73b7b7 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml
@@ -323,5 +323,24 @@
</if>
</select>
+ <!--获取部门详情（包含区域名称）-->
+ <select id="getDetailWithAreaName" resultType="org.sxkj.system.vo.DeptVO">
+ SELECT
+ bd.*,
+ br.name AS area_name
+ FROM
+ blade_dept bd
+ LEFT JOIN
+ blade_region br ON br.code = bd.area_code
+ WHERE
+ bd.is_deleted = 0
+ <if test="dept.id!=null">
+ and bd.id = #{dept.id}
+ </if>
+ <if test="dept.deptCode!=null and dept.deptCode!=''">
+ and bd.dept_code = #{dept.deptCode}
+ </if>
+ </select>
+
</mapper>
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/service/IDeptService.java b/drone-service/drone-system/src/main/java/org/sxkj/system/service/IDeptService.java
index 6cb2bc1..771999a 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/service/IDeptService.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/service/IDeptService.java
@@ -212,4 +212,12 @@
* @return
*/
List<DeptExcel> exportDept(DeptExportParam dept);
+
+ /**
+ * 获取部门详情（包含区域名称）
+ *
+ * @param dept 部门对象，包含查询条件
+ * @return 部门详情VO，包含区域名称
+ */
+ DeptVO getDetailWithAreaName(Dept dept);
}
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java b/drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java
index f44edac..e577702 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java
@@ -343,4 +343,9 @@
public List<DeptExcel> exportDept(DeptExportParam dept) {
return baseMapper.exportDept(dept);
}
+
+ @Override
+ public DeptVO getDetailWithAreaName(Dept dept) {
+ return baseMapper.getDetailWithAreaName(dept);
+ }
}
--
Gitblit v1.9.3