Merge remote-tracking branch 'origin/master'

Administrator

2023-08-09 67d965cb476bde49109a3773532c33dd9de60518

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

@@ -2,6 +2,7 @@

import java.util.List;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
import com.ruoyi.alarmpoints.well.service.IArdAlarmpointsWellService;
@@ -13,6 +14,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanValidators;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import lombok.ToString;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -94,6 +96,7 @@
        {
            throw new RuntimeException("井号已存在");
        }
        ardAlarmpointsWell.setId(IdUtils.simpleUUID());
        ardAlarmpointsWell.setUserId(SecurityUtils.getUserId());
        ardAlarmpointsWell.setCreateBy(SecurityUtils.getUsername());
        ardAlarmpointsWell.setCreateTime(DateUtils.getNowDate());
@@ -224,4 +227,12 @@
            }
        }
    }


    @Override
    public List<ArdAlarmpointsWell> wellByDeptList(List<Long> deptList) {
        QueryWrapper<ArdAlarmpointsWell> queryWrapper = new QueryWrapper<>();
        queryWrapper.in("dept_id",deptList);
        return ardAlarmpointsWellMapper.selectList(queryWrapper);
    }
}