Merge remote-tracking branch 'origin/master'

sinake

4 天以前 ee089a8ac4a9d99ef0a0491bbf1d80a2d4fbc393

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java

@@ -166,7 +166,7 @@
                serviceDonatecompletion.setId(serviceDonatecomporgans.get(0).getId());
                i = serviceDonatecomporganService.updateById(serviceDonatecompletion);
            }
            if (i) {
            if (i&&!serviceDonorchargeorgan.getOrganname().equals("遗体")) {
                serviceDonorchargeorgan.setId(null);
                QueryWrapper<ServiceDonorchargeorgan> queryWrapper = new QueryWrapper();
                queryWrapper.eq("InfoID", serviceDonorchargeorgan.getInfoid())