兴趣点动静态数据查询加入所属部门提交

zhangnaisong

2024-01-10 57dc08a1404b2fdf60e1ac2446eba9c7d8eca72f

兴趣点动静态数据查询加入所属部门提交

 ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java

@@ -17,6 +17,7 @@
import com.ruoyi.alarmpoints.well.service.IArdAlarmpointsWellService;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.domain.entity.SysConfig;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
@@ -25,6 +26,7 @@
import com.ruoyi.common.utils.bean.BeanValidators;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.utils.data.Query;
import com.ruoyi.utils.gis.GisUtil;
import lombok.ToString;
@@ -50,6 +52,9 @@
    private ArdAlarmpointsWellMapper ardAlarmpointsWellMapper;
    @Autowired
    protected Validator validator;

    @Resource
    protected SysDeptMapper sysDeptMapper;

    /**
     * 查询井管理
@@ -424,8 +429,15 @@
        }
        if(ardAlarmpointsWell.getDeptId() != null){
            result.put("deptId",ardAlarmpointsWell.getDeptId());
            SysDept sysDept = sysDeptMapper.selectDeptById(ardAlarmpointsWell.getDeptId());//查询兴趣点所在部门
            if(sysDept != null){
                result.put("deptName",sysDept.getDeptName());
            }else{
                result.put("deptName","");
            }
        }else{
            result.put("deptId","");
            result.put("deptName","");
        }
        if(ardAlarmpointsWell.getCreateBy() != null){
            result.put("createBy",ardAlarmpointsWell.getCreateBy());