器官分配，器官利用子表删除统一

sinake

10 小时以前 a9389e50d306a05565dfb869cc907638d91fa7c7

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java

@@ -81,7 +81,7 @@
    }

    @Override
    public boolean add(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
    public long add(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
        ServiceDonatecompletioninfo serviceDonatecompletioninfo = DtoConversionUtils.sourceToTarget(serviceDonatecompletioninfoVO, ServiceDonatecompletioninfo.class);
        boolean b = false;
        if (ObjectUtils.isNotEmpty(serviceDonatecompletioninfo)) {
@@ -94,7 +94,7 @@
                }
            }
        }
        return b;
        return serviceDonatecompletioninfo.getId();
    }

    @Override
@@ -106,7 +106,15 @@
        }
        if (CollectionUtils.isNotEmpty(serviceDonatecompletioninfoVO.getServiceDonatecomporganList())) {
            for (ServiceDonatecomporgan serviceDonatecomporgan : serviceDonatecompletioninfoVO.getServiceDonatecomporganList()) {
                serviceDonatecomporganService.updateById(serviceDonatecomporgan);
                if (ObjectUtils.isNotEmpty(serviceDonatecomporgan.getId())) {
                    if (ObjectUtils.isNotEmpty(serviceDonatecomporgan.getDelFlag()) && serviceDonatecomporgan.getDelFlag() == 1) {
                        serviceDonatecomporganService.getById(serviceDonatecomporgan.getId());
                    } else {
                        serviceDonatecomporganService.updateById(serviceDonatecomporgan);
                    }
                } else{
                    serviceDonatecomporganService.updateById(serviceDonatecomporgan);
            }
            }
        }

@@ -117,7 +125,7 @@
    public List<DonationCompletionBaseInfoDTO> getDonationCompletionBaseInfo(DonationCompletionBaseInfoVO donationCompletionBaseInfoVO) {
        List<DonationCompletionBaseInfoDTO> donationCompletionBaseInfoDTOList = serviceDonatecompletioninfoMapper.getDonationCompletionBaseInfo(donationCompletionBaseInfoVO);

        if (CollectionUtils.isNotEmpty(donationCompletionBaseInfoDTOList) && donationCompletionBaseInfoVO.getPageNum() == null) {
        if (CollectionUtils.isNotEmpty(donationCompletionBaseInfoDTOList) && donationCompletionBaseInfoVO.getPageNum() != null) {
            for (DonationCompletionBaseInfoDTO donationCompletionBaseInfoDTO : donationCompletionBaseInfoDTOList) {
                ServiceDonatecomporgan serviceDonatecomporgan = new ServiceDonatecomporgan();
                serviceDonatecomporgan.setInfoid(donationCompletionBaseInfoDTO.getInfoid());