工单-机构权限控制

linwei

2026-01-28 dab98d2c0f573d8e17a7786a879e595e6d535a9a

工单-机构权限控制

 drone-ops/drone-resource/src/main/java/org/sxkj/resource/controller/AttachController.java

@@ -191,15 +191,13 @@

    /**
     * 流式附件下载接口，支持下载zip压缩包，不使用本地存储
     * @param param
     * @param response
     * @throws IOException
     */
    @ApiOperation(value = "流式附件下载接口", notes = "使用流方式返回数据，不使用本地存储")
    @PostMapping("/downloadByByte")
    @GetMapping("/downloadByByte")
    public void downloadByByte(
        @ApiParam(value = "附件下载参数") @RequestBody AttachmentDownloadParam param,
        HttpServletResponse response) throws IOException {
        @ApiParam(value = "附件下载参数") @RequestParam("attachIds") String attachIds, HttpServletResponse response) throws IOException {

        // 设置文件名
        String timestamp = DateTimeUtil.format(LocalDateTime.now(), "yyyyMMdd_HHmmss");
@@ -214,7 +212,7 @@
        try {
            outputStream = response.getOutputStream();

            Boolean result = attachService.downloadByByte(param, outputStream);
            Boolean result = attachService.downloadByByte(attachIds, outputStream);
            if (!result) {
                return;
            }

 drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/AttachMapper.xml

@@ -38,6 +38,12 @@
        <if test="attach.resultType!=null">
            and result_type = #{attach.resultType}
        </if>
        <if test="attach.deptList != null and attach.deptList.size > 0">
            and ba.create_dept in
            <foreach collection="attach.deptList" item="deptId" open="(" separator="," close=")">
                #{deptId}
            </foreach>
        </if>
            and result_type in (1,2,3,4,5)
        order by create_time desc,id desc
    </select>
@@ -481,57 +487,20 @@
    </select>

    <select id="getAttachList" resultType="org.sxkj.resource.vo.AttachVO">
        select attach.name, attach.wayline_job_id, job.name jobName
        from wayline_job job
        left join blade_attach attach on attach.wayline_job_id = job.job_id
        left join manage_device device on attach.device_sn = device.device_sn
        <where>
        select
            attach.*
        from
            blade_attach attach
         <where>
            <if test="attachIds!=null and attachIds.size()>0">
                and attach.id in
                <foreach item="item" index="index" collection="attachIds" open="(" close=")" separator=",">
                    #{item}
                </foreach>
            </if>
            <if test="wayLineJobIds!=null and wayLineJobIds.size()>0">
                and attach.wayline_job_id in
                <foreach item="item" index="index" collection="wayLineJobIds" open="(" close=")" separator=",">
                    #{item}
                </foreach>
            </if>
            <if test="startTime!=null and startTime !='' and  endTime!=null and endTime !='' ">
                and DATE_FORMAT(FROM_UNIXTIME(job.execute_time/1000,'%Y-%m-%d %H:%i:%s'),'%Y-%m-%d %H:%i:%s') between
                #{startTime} and #{endTime}
            </if>
            <if test="dockSn!=null and dockSn!=''">
                and attach.device_sn = #{dockSn}
            </if>
            <if test="jobName!=null and jobName!=''">
                and job.name like concat('%',#{jobName},'%')
            </if>
            <if test="fileName!=null and fileName!=''">
                and attach.name like concat('%',#{fileName},'%')
            </if>
            <if test="fileType!=null and fileType!=''">
                <choose>
                    <when test="fileType=='visable'">
                        and attach.media_category = 0
                    </when>
                    <when test="fileType=='ir'">
                        and attach.media_category = 1
                    </when>
                </choose>
            </if>
            <!-- <if test="resultType!=null and resultType!=''"> -->
            <!--     and attach.result_type = #{resultType} -->
            <!-- </if> -->
            <if test="resultTypes!=null and resultTypes.size()>0">
                and attach.result_type in
                <foreach collection="resultTypes" item="resultType" open="(" close=")" separator=",">
                    #{resultType}
                </foreach>
            </if>
            AND attach.wayline_job_id IS NOT NULL
            AND job.NAME IS NOT NULL
            AND attach.is_deleted = 0
        </where>
    </select>

 drone-ops/drone-resource/src/main/java/org/sxkj/resource/param/AttachPageParam.java

@@ -3,6 +3,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@Data
public class AttachPageParam {

@@ -16,4 +18,8 @@
     */
    @ApiModelProperty(value = "附件原名")
    private String originalName;


    @ApiModelProperty(value = "部门集合",hidden = true)
    private List<Long> deptList;
}

 drone-ops/drone-resource/src/main/java/org/sxkj/resource/service/IAttachService.java

@@ -219,6 +219,6 @@
     * @return 处理结果
     * @throws IOException IO异常
     */
    Boolean downloadByByte(AttachmentDownloadParam param, java.io.OutputStream outputStream) throws IOException;
    Boolean downloadByByte(String param, java.io.OutputStream outputStream) throws IOException;

}

 drone-ops/drone-resource/src/main/java/org/sxkj/resource/service/impl/AttachServiceImpl.java

@@ -115,7 +115,10 @@

    @Override
    public IPage<AttachVO> selectAttachPage(IPage<AttachVO> page, AttachPageParam attach) {
         List<AttachVO> attachVOS   = baseMapper.selectAttachPage(page, attach);
        // 创建部门
        List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        attach.setDeptList(deptList);
          List<AttachVO> attachVOS   = baseMapper.selectAttachPage(page, attach);
        return page.setRecords(attachVOS);
    }

@@ -786,18 +789,11 @@
     * @throws IOException
     */
    @Override
    public Boolean downloadByByte(AttachmentDownloadParam param, OutputStream outputStream) throws IOException {
        // 如果附件id集合并且任务id集合参数都为空，就判断起止时间是否都有为空，如果都为空，则返回错误
        param.setAreaCode(HeaderUtils.formatAreaCode(param.getAreaCode()));
        if (CollectionUtils.isEmpty(param.getAttachIds())) {
            // 判断起止时间是否为空
            if (StringUtils.isEmpty(param.getStartTime()) || StringUtils.isEmpty(param.getEndTime())) {
                return false;
            }
        }

    public Boolean downloadByByte(String param, OutputStream outputStream) throws IOException {
        AttachmentDownloadParam attachmentDownloadParam = new AttachmentDownloadParam();
        attachmentDownloadParam.setAttachIds(Func.toLongList(param));
        // 获取附件列表
        List<AttachVO> attachList = getAttachList(param);
        List<AttachVO> attachList = getAttachList(attachmentDownloadParam);
        if (CollectionUtils.isEmpty(attachList)) {
            return false;
        }

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideDTO.java

@@ -122,7 +122,7 @@
    @ApiModelProperty(value = "区域编码")
    private String areaCode;

    @ApiModelProperty(value = "机构id集合")
    @ApiModelProperty(value = "部门集合",hidden = true)
    private List<Long> deptList;



 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideStatisticsDTO.java

@@ -106,6 +106,6 @@
    @ApiModelProperty(value = "删除标志（0存在 1删除）")
    private Integer isDeleted;

    @ApiModelProperty(value = "部门id集合")
    @ApiModelProperty(value = "部门集合",hidden = true)
    private List<Long> deptList;
}

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseSceneVO.java

@@ -134,6 +134,6 @@
    private Integer status;


    @ApiModelProperty(value = "部门列表")
    @ApiModelProperty(value = "部门集合",hidden = true)
    private List<Long> deptList;
}

 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/param/FwEffectEvalParam.java

@@ -43,6 +43,6 @@
    @ApiModelProperty(value = "反制方式：1.信号干扰/2.诱导驱离/无")
    private String counterWay;

    @ApiModelProperty(value = "部门ID")
    @ApiModelProperty(value = "部门集合",hidden = true)
    private List<Long> deptList;
}

 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/param/FwTaskSchedulePageParam.java

@@ -44,6 +44,6 @@
    /**
     * 部门id
     */
    @ApiModelProperty(value = "部门id")
    @ApiModelProperty(value = "部门集合",hidden = true)
    private List<Long> deptList;
}

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java

@@ -143,7 +143,7 @@
    @ApiModelProperty(value = "经度")
    private String longitude;

    @ApiModelProperty(value = "部门id")
    @ApiModelProperty(value = "部门集合",hidden = true)
    private List<Long> deptList;



 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceMaintainPlanDTO.java

@@ -64,7 +64,7 @@
    @ApiModelProperty(value = "所属部门")
    private Long belongDept;

    @ApiModelProperty(value = "部门id")
    @ApiModelProperty(value = "部门集合",hidden = true)
    private List<Long> deptList;



 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceScrapDTO.java

@@ -75,7 +75,7 @@
    private Long belongDept;


    @ApiModelProperty(value = "部门列表")
    @ApiModelProperty(value = "部门集合",hidden = true)
    private List<Long> deptList;



 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java

@@ -142,7 +142,6 @@
    @Override
    public List<DeviceStatisticsVO> getDeviceManufacturerStatistics() {
        List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        deptList.addAll(deptList);
        return baseMapper.getDeviceManufacturerStatistics(deptList);
    }


 drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java

@@ -151,6 +151,6 @@
    @ApiModelProperty(value = "当前用户id")
    private Long currentUserId;

    @ApiModelProperty(value = "部门id")
    @ApiModelProperty(value = "部门集合",hidden = true)
    private List<Long> deptList;
}

 drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneFlightRecordDTO.java

@@ -91,7 +91,7 @@
    @ApiModelProperty(value = "区域名称")
    private String areaName;

    @ApiModelProperty(value = "部门ID")
    @ApiModelProperty(value = "部门集合",hidden = true)
    private List<Long> deptList;

}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/mapper/GdFlyerMapper.xml

@@ -39,7 +39,10 @@
    </resultMap>

    <select id="selectGdFlyerPage" resultMap="gdFlyerVOResultMap">
        select * from ja_gd_flyer
        select
            *
        from
            ja_gd_flyer
        <where>
                is_deleted = 0
            <if test="param2.flyerName != null and param2.flyerName != ''">
@@ -57,6 +60,12 @@
            <if test="param2.skilledTaskType != null and param2.skilledTaskType != ''">
                and skilled_task_type = #{param2.skilledTaskType}
            </if>
            <if test="param2.deptList != null and param2.deptList.size > 0">
                AND create_dept in
                <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
                    #{deptId}
                </foreach>
            </if>
        </where>
    </select>


 drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/param/GdFlyerPageParam.java

@@ -50,4 +50,7 @@
    // 纬度
    @ApiModelProperty(value = "纬度")
    private String latitude;

    @ApiModelProperty(value = "部门集合",hidden = true)
    private List<Long> deptList;
}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/service/impl/GdFlyerServiceImpl.java

@@ -16,6 +16,7 @@
 */
package org.sxkj.gd.flyer.service.impl;

import org.springblade.core.secure.utils.AuthUtil;
import org.sxkj.gd.flyer.entity.GdFlyerEntity;
import org.sxkj.gd.flyer.param.GdFlyerPageParam;
import org.sxkj.gd.flyer.vo.GdFlyerVO;
@@ -26,6 +27,8 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.sxkj.system.cache.SysCache;

import java.util.List;

/**
@@ -39,6 +42,8 @@

    @Override
    public IPage<GdFlyerVO> selectGdFlyerPage(IPage<GdFlyerVO> page, GdFlyerPageParam gdFlyer) {
        List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        gdFlyer.setDeptList(deptList);
        return page.setRecords(baseMapper.selectGdFlyerPage(page, gdFlyer));
    }


 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdApplicationInnovationMapper.xml

@@ -25,18 +25,25 @@


    <select id="selectGdApplicationInnovationPage" resultMap="gdApplicationInnovationResultMap">
        select * from ja_gd_application_innovation
        select
            *
        from
            ja_gd_application_innovation
        <where>
                and is_deleted = 0
            <if test="param2.caseName != null and param2.caseName != ''">
                and case_name like concat('%',#{param2.caseName},'%')
            </if>
            <if test="param2.innovationStatus != null and param2.innovationStatus != ''">
                and innovation_status = #{param2.innovationStatus}
            </if>
                and is_deleted = 0
            <if test="param2.deptList != null and param2.deptList.size > 0">
                and create_dept in
                <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
                    #{deptId}
                </foreach>
            </if>
        </where>


    </select>



 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataEvaluationMapper.xml

@@ -33,6 +33,12 @@
            <if test="param.isResolved != null and param.isResolved != ''">
                AND is_resolved = #{param.isResolved}
            </if>
            <if test="param.deptList != null and param.deptList.size > 0">
                AND create_dept in
                <foreach collection="param.deptList" item="deptId" open="(" separator="," close=")">
                    #{deptId}
                </foreach>
            </if>
        </where>
    </select>


 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml

@@ -36,9 +36,10 @@
        from
            ja_gd_data_objection do
        left join
            ja_gd_data_objection_attachment da
            on do.id = da.objection_id
        left join blade_dept bd on bd.id = do.create_dept
                ja_gd_data_objection_attachment da
                on do.id = da.objection_id
        left join
                blade_dept bd on bd.id = do.create_dept
        <where>
                do.is_deleted = 0
            <if test="param2.title != null and param2.title != ''">
@@ -47,6 +48,12 @@
            <if test="param2.objectionStatus != null and param2.objectionStatus != ''">
                and do.objection_status = #{param2.objectionStatus}
            </if>
            <if test="param2.deptList != null and param2.deptList.size > 0">
                and do.create_dept in
                <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
                    #{deptId}
                </foreach>
            </if>
        </where>
        group by do.id
    </select>

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandMapper.java

@@ -40,10 +40,9 @@
     *
     * @param page
     * @param gdSupplyDemand
     * @param deptIdList
     * @return
     */
    List<GdSupplyDemandVO> selectGdSupplyDemandPage(IPage page, @Param("param") GdSupplyDemandPageParam gdSupplyDemand, @Param("deptIdList") List<Long> deptIdList);
    List<GdSupplyDemandVO> selectGdSupplyDemandPage(IPage page, @Param("param") GdSupplyDemandPageParam gdSupplyDemand);

    /**
     * 列表分页

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandMapper.xml

@@ -139,14 +139,14 @@
            <if test="param.demandStatus != null and param.demandStatus != ''">
                AND demand_status = #{param.demandStatus}
            </if>
            <if test="deptIdList != null and deptIdList.size > 0">
            <if test="param.deptList != null and param.deptList.size > 0">
                AND (
                    create_dept IN
                    <foreach collection="deptIdList" item="deptId" open="(" separator="," close=")">
                    <foreach collection="param.deptList" item="deptId" open="(" separator="," close=")">
                        #{deptId}
                    </foreach>
                    OR apply_target_dept_id IN
                    <foreach collection="deptIdList" item="deptId" open="(" separator="," close=")">
                    <foreach collection="param.deptList" item="deptId" open="(" separator="," close=")">
                        #{deptId}
                    </foreach>
                )

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/param/GdApplicationInnovationPageParam.java

@@ -3,6 +3,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@Data
public class GdApplicationInnovationPageParam {

@@ -17,4 +19,11 @@
    @ApiModelProperty(value = "应用创新状态（0.审核中/1.审核通过/2.审核不通过）")
    private String innovationStatus;

    //
    @ApiModelProperty(value = "部门集合",hidden = true)
    private List<Long> deptList;

    @ApiModelProperty(value = "是否查询所有")
    private Boolean isQueryAll = true;

}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/param/GdDataEvaluationPageParam.java

@@ -20,6 +20,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * 数据评价管理表 分页查询参数
 *
@@ -42,4 +44,10 @@
    @ApiModelProperty(value = "是否解决（0否 1是）")
    private String isResolved;

    @ApiModelProperty(value = "部门集合",hidden = true)
    private List<Long> deptList;

    @ApiModelProperty(value = "是否查询所有")
    private Boolean isQueryAll = true;

}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/param/GdDataObjectionPageParam.java

@@ -3,6 +3,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@Data
public class GdDataObjectionPageParam {
    /**
@@ -16,4 +18,7 @@
     */
    @ApiModelProperty(value = "异议状态（草稿/待处理/已反馈）")
    private String objectionStatus;

    @ApiModelProperty(value = "部门集合",hidden = true)
    private List<Long> deptList;
}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/param/GdSupplyDemandPageParam.java

@@ -20,6 +20,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * 供需需求信息表 分页查询参数
 *
@@ -42,4 +44,7 @@
    @ApiModelProperty(value = "需求状态")
    private String demandStatus;

    @ApiModelProperty(value = "部门集合",hidden = true)
    private List<Long> deptList;

}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdApplicationInnovationServiceImpl.java

@@ -16,6 +16,7 @@
 */
package org.sxkj.gd.orderdata.service.impl;

import org.springblade.core.secure.utils.AuthUtil;
import org.sxkj.gd.orderdata.entity.GdApplicationInnovationEntity;
import org.sxkj.gd.orderdata.param.GdApplicationInnovationPageParam;
import org.sxkj.gd.orderdata.vo.GdApplicationInnovationVO;
@@ -26,6 +27,8 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.sxkj.system.cache.SysCache;

import java.util.List;

/**
@@ -39,6 +42,10 @@

    @Override
    public IPage<GdApplicationInnovationVO> selectGdApplicationInnovationPage(IPage<GdApplicationInnovationVO> page, GdApplicationInnovationPageParam gdApplicationInnovation) {
        if(gdApplicationInnovation.getIsQueryAll()){
            List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
            gdApplicationInnovation.setDeptList(deptList);
        }
        return page.setRecords(baseMapper.selectGdApplicationInnovationPage(page, gdApplicationInnovation));
    }


 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdDataEvaluationServiceImpl.java

@@ -16,6 +16,7 @@
 */
package org.sxkj.gd.orderdata.service.impl;

import org.springblade.core.secure.utils.AuthUtil;
import org.sxkj.gd.orderdata.entity.GdDataEvaluationEntity;
import org.sxkj.gd.orderdata.param.GdDataEvaluationPageParam;
import org.sxkj.gd.orderdata.vo.GdDataEvaluationVO;
@@ -26,6 +27,8 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.sxkj.system.cache.SysCache;

import java.util.List;

/**
@@ -39,6 +42,10 @@

    @Override
    public IPage<GdDataEvaluationVO> selectGdDataEvaluationPage(IPage<GdDataEvaluationVO> page, GdDataEvaluationPageParam gdDataEvaluation) {
        if(gdDataEvaluation.getIsQueryAll()){
            List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
            gdDataEvaluation.setDeptList(deptList);
        }
        return page.setRecords(baseMapper.selectGdDataEvaluationPage(page, gdDataEvaluation));
    }


 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdDataObjectionServiceImpl.java

@@ -52,6 +52,8 @@

    @Override
    public IPage<GdDataObjectionVO> selectGdDataObjectionPage(IPage<GdDataObjectionVO> page, GdDataObjectionPageParam gdDataObjection) {
        List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        gdDataObjection.setDeptList(deptList);
        return page.setRecords(baseMapper.selectGdDataObjectionPage(page, gdDataObjection));
    }


 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdSupplyDemandServiceImpl.java

@@ -74,7 +74,8 @@

    @Override
    public IPage<GdSupplyDemandVO> selectGdSupplyDemandPage(IPage<GdSupplyDemandVO> page, GdSupplyDemandPageParam gdSupplyDemand) {
        return page.setRecords(baseMapper.selectGdSupplyDemandPage(page, gdSupplyDemand, SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()))));
        gdSupplyDemand.setDeptList(SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId())));
        return page.setRecords(baseMapper.selectGdSupplyDemandPage(page, gdSupplyDemand));
    }

    @Override

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.java

@@ -40,10 +40,9 @@
     *
     * @param page
     * @param gdPatrolTask
     * @param deptIdList
     * @return
     */
    List<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage page, GdPatrolTaskPageParam gdPatrolTask, List<Long> deptIdList);
    List<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage page, GdPatrolTaskPageParam gdPatrolTask);


    /**

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml

@@ -67,9 +67,9 @@
            <if test="param2.taskStatus != null and param2.taskStatus != ''">
                and pt.task_status = #{param2.taskStatus}
            </if>
            <if test="param3 != null and param3.size > 0">
            <if test="param2.deptList != null and param2.deptList.size > 0">
                and pt.create_dept in
                <foreach collection="param3" item="deptId" open="(" separator="," close=")">
                <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
                    #{deptId}
                </foreach>
            </if>

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml

@@ -55,30 +55,31 @@

    <select id="selectGdWorkOrderPage" resultMap="gdWorkOrderResultMap">
        select
        wo.id,
        wo.work_order_name,
        wo.work_order_code,
        wo.work_order_type,
        wo.device_load_demand,
        wo.recommend_device_ids,
        wo.work_order_status,
        wo.execute_start_time,
        wo.execute_end_time,
        wo.service_party,
        ST_AsText(wo.geom) geom,
        wo.remark,
        wo.area_code,
        wo.create_user,
        wo.create_dept,
        wo.create_time,
        wo.update_user,
        wo.update_time,
        wo.status,
        wo.is_deleted,
        bu.name create_user_name
            wo.id,
            wo.work_order_name,
            wo.work_order_code,
            wo.work_order_type,
            wo.device_load_demand,
            wo.recommend_device_ids,
            wo.work_order_status,
            wo.execute_start_time,
            wo.execute_end_time,
            wo.service_party,
            ST_AsText(wo.geom) geom,
            wo.remark,
            wo.area_code,
            wo.create_user,
            wo.create_dept,
            wo.create_time,
            wo.update_user,
            wo.update_time,
            wo.status,
            wo.is_deleted,
            bu.name create_user_name
        from ja_gd_work_order wo
            left join blade_user bu on wo.create_user = bu.id
        <where>
                and wo.is_deleted = 0
            <if test="param2.workOrderStatus != null and param2.workOrderStatus != ''">
                and wo.work_order_status like concat(#{param2.workOrderStatus},'%')
            </if>
@@ -94,7 +95,12 @@
            <if test="param2.startTime != null and param2.startTime != '' and param2.endTime != null and param2.endTime != ''">
                and wo.create_time BETWEEN #{param2.startTime} AND #{param2.endTime}
            </if>
            and wo.is_deleted = 0
            <if test="param2.deptList != null and param2.deptList.size > 0">
                and wo.create_dept in
                <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
                    #{deptId}
                </foreach>
            </if>
        </where>
    </select>


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/GdPatrolTaskPageParam.java

@@ -1,7 +1,11 @@
package org.sxkj.gd.workorder.param;

import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import springfox.documentation.annotations.ApiIgnore;

import java.util.List;

@Data
public class GdPatrolTaskPageParam {
@@ -36,4 +40,10 @@

    @ApiModelProperty(value = "结束时间")
    private String endTime;

    @ApiModelProperty(value = "部门集合",hidden = true)
    private List<Long> deptList;

    @ApiModelProperty(value = "是否查询所有")
    private Boolean isQueryAll = true;
}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderPageParam.java

@@ -4,6 +4,7 @@
import lombok.Data;

import javax.validation.constraints.NotNull;
import java.util.List;

@Data
public class WorkOrderPageParam {
@@ -34,4 +35,10 @@

    @ApiModelProperty(value = "结束时间")
    private String endTime;

    @ApiModelProperty(value = "是否查询所有：默认true   审核方可以查询所有数据，不做机构过滤")
    private Boolean isQueryAll =  true;

    @ApiModelProperty(value = "部门集合",hidden = true)
    private List<Long> deptList;
}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdOperationalRevenueServiceImpl.java

@@ -5,13 +5,16 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.stereotype.Service;
import org.sxkj.gd.workorder.entity.GdOperationalRevenue;
import org.sxkj.gd.workorder.mapper.GdOperationalRevenueMapper;
import org.sxkj.gd.workorder.service.GdOperationalRevenueService;
import org.sxkj.gd.workorder.vo.GdOperationalRevenueVo;
import org.sxkj.system.cache.SysCache;

import java.math.BigDecimal;
import java.util.List;

/**
 * 运营收益Service实现类
@@ -69,8 +72,9 @@
        if (StringUtils.hasText(nickName)) {
            queryWrapper.like(GdOperationalRevenue::getNickName, nickName);
        }


        // 创建部门
        List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        queryWrapper.in(GdOperationalRevenue::getCreateDept, deptList);
        // 按创建时间倒序
        queryWrapper.orderByDesc(GdOperationalRevenue::getCreateTime);


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java

@@ -77,11 +77,11 @@
@Service
public class GdPatrolTaskServiceImpl extends BaseServiceImpl<GdPatrolTaskMapper, GdPatrolTaskEntity> implements IGdPatrolTaskService {

    @Autowired
    private IGdWorkOrderFlowService gdWorkOrderFlowService;
    @Autowired
    private IGdWorkOrderFlowService gdWorkOrderFlowService;

    // @Autowired
    // private IGdWorkOrderService gdWorkOrderService;
    // @Autowired
    // private IGdWorkOrderService gdWorkOrderService;
    @Autowired
    private ISysClient sysClient;
    @Autowired
@@ -96,7 +96,9 @@
    private IGdManageDeviceService gdManageDeviceService;
    @Override
    public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask) {
        return page.setRecords(baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask, SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()))));
        List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        gdPatrolTask.setDeptList(deptList);
        return page.setRecords(baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask));
    }



 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java

@@ -29,6 +29,7 @@
import org.sxkj.gd.workorder.service.IGdWorkOrderFlowService;
import org.sxkj.gd.workorder.service.IGdWorkOrderService;
import org.sxkj.gd.workorder.vo.GdWorkOrderVO;
import org.sxkj.system.cache.SysCache;

import java.util.Date;
import java.util.List;
@@ -55,7 +56,11 @@

    @Override
    public IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, WorkOrderPageParam gdWorkOrder) {
        return page.setRecords(baseMapper.selectGdWorkOrderPage(page, gdWorkOrder));
        if(gdWorkOrder.getIsQueryAll()){
            List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
            gdWorkOrder.setDeptList(deptList);
        }
         return page.setRecords(baseMapper.selectGdWorkOrderPage(page, gdWorkOrder));
    }



 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java

@@ -86,7 +86,7 @@
     * 关联设备ID
     */
    @ApiModelProperty(value = "关联设备ID")
    private Long deviceId;
    private String deviceId;

    @ApiModelProperty(value = "设备名称")
    private String deviceName;