代码提交

liusheng

10 天以前 d88fffd5d757a23f302011ced88dea92e1ce31e9

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

@@ -82,6 +82,9 @@
    @Override
    public List<ServiceDonateorgan> queryList(ServiceDonateorgan serviceDonateorgan) {
        LambdaQueryWrapper<ServiceDonateorgan> wrappers = Wrappers.lambdaQuery();
        if (StringUtils.isNotNull(serviceDonateorgan.getBaseId())) {
            wrappers.eq(ServiceDonateorgan::getBaseId, serviceDonateorgan.getBaseId());
        }
        if (StringUtils.isNotNull(serviceDonateorgan.getInfoid())) {
            wrappers.eq(ServiceDonateorgan::getInfoid, serviceDonateorgan.getInfoid());
        }
@@ -446,7 +449,7 @@
    @Override
    public List<DonateOrganVO> selectVOList(DonateOrganVO donateOrganVO) {
        List<DonateOrganVO> donateOrganVOS = serviceDonateorganMapper.selectVOList(donateOrganVO);
        for (DonateOrganVO donateOrganVO1:donateOrganVOS) {
        for (DonateOrganVO donateOrganVO1 : donateOrganVOS) {
            if (donateOrganVO1.getBirthday() != null) {
                Map<String, String> map = CalculateDateUtils.calculateAge(donateOrganVO1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
                donateOrganVO1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);