Merge branch 'master' of http://116.62.18.175:6699/r/opo-qd

yxh

4 天以前 d42096fd55c4b0caf84bb4f208b4e17534e158c1

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

@@ -152,7 +152,11 @@
            b = updateById(serviceDonateorganBase);
            if (b == true && CollectionUtils.isNotEmpty(serviceDonateorganBaseVO.getServiceDonateorganList())) {
                for (ServiceDonateorgan serviceDonateorgan : serviceDonateorganBaseVO.getServiceDonateorganList()) {
                    serviceDonateorganMapper.updateById(serviceDonateorgan);
                    if(ObjectUtils.isNotEmpty(serviceDonateorgan.getId()) ) {
                        serviceDonateorganMapper.updateById(serviceDonateorgan);
                    }else {
                        serviceDonateorganMapper.insert(serviceDonateorgan);
                    }
                }
            }
        }