ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java
@@ -108,12 +108,12 @@ for (ServiceDonatecomporgan serviceDonatecomporgan : serviceDonatecompletioninfoVO.getServiceDonatecomporganList()) { if (ObjectUtils.isNotEmpty(serviceDonatecomporgan.getId())) { if (ObjectUtils.isNotEmpty(serviceDonatecomporgan.getDelFlag()) && serviceDonatecomporgan.getDelFlag() == 1) { serviceDonatecomporganService.getById(serviceDonatecomporgan.getId()); serviceDonatecomporganService.removeById(serviceDonatecomporgan.getId()); } else { serviceDonatecomporganService.updateById(serviceDonatecomporgan); } } else{ serviceDonatecomporganService.updateById(serviceDonatecomporgan); serviceDonatecomporganService.save(serviceDonatecomporgan); } } } ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecomporganServiceImpl.java
@@ -30,6 +30,7 @@ @Override public List<ServiceDonatecomporgan> queryList(ServiceDonatecomporgan serviceDonatecomporgan) { LambdaQueryWrapper<ServiceDonatecomporgan> wrappers = Wrappers.lambdaQuery(); wrappers.eq(ServiceDonatecomporgan::getDelFlag, 0); if (serviceDonatecomporgan.getInfoid() != null) { wrappers.eq(ServiceDonatecomporgan::getInfoid, serviceDonatecomporgan.getInfoid()); } ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java
@@ -148,6 +148,7 @@ for (DonationwitnessBaseInfoDTO donationwitnessBaseInfoDTO : donationwitnessBaseInfos) { ServiceDonationwitnessorgan serviceDonationwitnessorgan = new ServiceDonationwitnessorgan(); serviceDonationwitnessorgan.setInfoid(donationwitnessBaseInfoDTO.getInfoid()); serviceDonationwitnessorgan.setDelFlag(0); List<ServiceDonationwitnessorgan> serviceDonationwitnessorgans = serviceDonationwitnessorganMapper.selectServiceDonationwitnessorganList(serviceDonationwitnessorgan); donationwitnessBaseInfoDTO.setServiceDonationwitnessorgans(serviceDonationwitnessorgans); } ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml
@@ -71,6 +71,7 @@ resultMap="ServiceDonationwitnessorganResult"> <include refid="selectServiceDonationwitnessorganVo"/> <where> and del_flag=0 <if test="infoid != null ">and InfoID = #{infoid}</if> <if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if> <if test="organno != null and organno != ''">and OrganNo = #{organno}</if>
