机构管理

linwei

2026-01-23 1c301aa0a38e10f71f42cc4fa4606a2118cb9766

机构管理

 drone-service-api/drone-system-api/src/main/java/org/sxkj/system/entity/Dept.java

@@ -125,4 +125,7 @@
    @ApiModelProperty(value = "行政区划代码")
    private String areaCode;

    @ApiModelProperty(value = "状态")
    private Integer status;

}

 drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java

@@ -18,6 +18,7 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.*;
@@ -27,6 +28,7 @@
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.PreAuth;
import org.springblade.core.tenant.annotation.NonDS;
@@ -45,6 +47,7 @@
import org.sxkj.system.enums.DictEnum;
import org.sxkj.system.mapper.DeptMapper;
import org.sxkj.system.mapper.UserMapper;
import org.sxkj.system.param.DeptPageParam;
import org.sxkj.system.service.IDeptService;
import org.sxkj.system.vo.DeptVO;
import org.sxkj.system.wrapper.DeptWrapper;
@@ -87,6 +90,16 @@
        return R.data(DeptWrapper.build().entityVO(detail));
    }

    /**
     * 飞手表 自定义分页
     */
    @GetMapping("/page")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = " ")
    public R<IPage<DeptVO>> page(DeptPageParam deptPageParam, Query query) {
        IPage<DeptVO> pages = deptService.selectDeptPage(Condition.getPage(query), deptPageParam);
        return R.data(pages);
    }
    /**
     * 列表
     */
@@ -302,8 +315,8 @@
    @ApiOperation(value = "查询机构树（根据区域）")
    public R deptsByAreaCode(@RequestParam(required = false) String areaCode) {
        String areaCodez = HeaderUtils.getAreaCode();
        if(StringUtils.isNotBlank(areaCode)) {
            areaCodez=areaCode;
        if (StringUtils.isNotBlank(areaCode)) {
            areaCodez = areaCode;
        }
        List<DeptVO> list = deptService.deptsByAreaCode(areaCodez);
        return R.data(list);

 drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.java

@@ -17,11 +17,13 @@
package org.sxkj.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.sxkj.common.node.TreeStringNode;
import org.sxkj.system.entity.Dept;
import org.sxkj.system.param.DeptPageParam;
import org.sxkj.system.vo.DeptVO;

import java.util.List;
@@ -116,4 +118,12 @@

    String getFullRegionName(String areaCode);
    String getSingleRegionName(String areaCode);

    /**
     *
     * @param page
     * @param deptPageParam
     * @return
     */
    IPage<DeptVO> selectDeptPage(IPage<DeptVO> page, DeptPageParam deptPageParam);
}

 drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml

@@ -276,6 +276,20 @@
        AND r.code = #{areaCode}
    </select>

    <select id="selectDeptPage" resultType="org.sxkj.system.vo.DeptVO">
        SELECT
            bd.*
        FROM
            blade_dept bd
        WHERE
            bd.is_deleted = 0
        <if test="param2.deptName!=null and param2.deptName!=''">
            and bd.dept_name like concat(concat('%', #{param2.deptName}),'%')
        </if>
        <if test="param2.fullName!=null and param2.fullName!=''">
            and bd.full_name like concat(concat('%', #{param2.fullName}),'%')
        </if>
    </select>


</mapper>

 drone-service/drone-system/src/main/java/org/sxkj/system/param/DeptPageParam.java

New file
@@ -0,0 +1,14 @@
package org.sxkj.system.param;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class DeptPageParam {

    @ApiModelProperty(value = "部门名称")
    private String deptName;

    @ApiModelProperty(value = "部门全称")
    private String fullName;
}

 drone-service/drone-system/src/main/java/org/sxkj/system/service/IDeptService.java

@@ -16,10 +16,12 @@
 */
package org.sxkj.system.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.core.tool.api.R;
import org.sxkj.common.node.TreeStringNode;
import org.sxkj.system.entity.Dept;
import org.sxkj.system.param.DeptPageParam;
import org.sxkj.system.vo.DeptVO;

import java.util.List;
@@ -175,4 +177,12 @@
     * @return 部门列表
     */
    List<DeptVO> deptsByAreaCode(String areaCode);

    /**
     *
     * @param page
     * @param deptPageParam
     * @return
     */
    IPage<DeptVO> selectDeptPage(IPage<DeptVO> page, DeptPageParam deptPageParam);
}

 drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java

@@ -17,6 +17,7 @@
package org.sxkj.system.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
@@ -38,6 +39,7 @@
import org.sxkj.system.cache.SysCache;
import org.sxkj.system.entity.Dept;
import org.sxkj.system.mapper.DeptMapper;
import org.sxkj.system.param.DeptPageParam;
import org.sxkj.system.service.IDeptService;
import org.sxkj.system.vo.DeptVO;
import org.sxkj.system.wrapper.DeptWrapper;
@@ -294,4 +296,9 @@
        });
        return list;
    }

    @Override
    public IPage<DeptVO> selectDeptPage(IPage<DeptVO> page, DeptPageParam deptPageParam) {
        return baseMapper.selectDeptPage(page, deptPageParam);
    }
}