Merge remote-tracking branch 'origin/dev_New' into dev_New

gongchunyi

17 小时以前 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

 src/main/java/com/ruoyi/safe/service/impl/SafeHazardServiceImpl.java

@@ -1,13 +1,18 @@
package com.ruoyi.safe.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.safe.mapper.SafeHazardRecordMapper;
import com.ruoyi.safe.pojo.SafeHazard;
import com.ruoyi.safe.mapper.SafeHazardMapper;
import com.ruoyi.safe.pojo.SafeHazardRecord;
import com.ruoyi.safe.service.SafeHazardService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -23,8 +28,24 @@
    @Autowired
    private SafeHazardMapper safeHazardMapper;

    @Autowired
    private SafeHazardRecordMapper safeHazardRecordMapper;

    @Override
    public IPage<SafeHazard> pageSafeHazard(Page page, SafeHazard safeHazard) {
        return safeHazardMapper.pageSafeHazard(page, safeHazard);
    }

    @Override
    public int delSafeHazard(List<Integer> ids) {
        //判断是否有正在领用的危险源
        List<SafeHazardRecord> safeHazardRecords = safeHazardRecordMapper.selectList(Wrappers.<SafeHazardRecord>lambdaQuery()
                .in(SafeHazardRecord::getSafeHazardId, ids)
                .isNull(SafeHazardRecord::getReturnUserId));
        if (safeHazardRecords.size()>0){
            throw new RuntimeException("该危险源已经领用,无法删除,等归还之后再进行删除!");
        }
        safeHazardMapper.deleteBatchIds(ids);
        return 0;
    }
}