吉安感知网项目-后端
linwei
2026-02-02 1cbc3456ff88a4a2a3c41cdc969f8a2d738b654c
机构详情优化
5 files modified
44 ■■■■■ changed files
drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java 4 ●●●● patch | view | raw | blame | history
drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.java 8 ●●●●● patch | view | raw | blame | history
drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml 19 ●●●●● patch | view | raw | blame | history
drone-service/drone-system/src/main/java/org/sxkj/system/service/IDeptService.java 8 ●●●●● patch | view | raw | blame | history
drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java 5 ●●●●● patch | view | raw | blame | history
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);
    }
    /**
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);
}
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>
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);
}
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);
    }
}