Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-17 1d4473f81abe4ef200f23b781756a7da689dc718

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java

@@ -26,10 +26,12 @@

import javax.annotation.Resource;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;

import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.stream.Collectors;

/**
 * <p>
@@ -80,7 +82,8 @@
        }
        String personIds = byId.getPersonIds();
        if (StringUtils.isNotEmpty(personIds)){
            List<AppUser> appUserList = appUserClient.listByIds(Arrays.asList(personIds.split(",")));
            List<Long> ids = Arrays.stream(personIds.split(",")).map(Long::valueOf).collect(Collectors.toList());
            List<AppUser> appUserList = appUserClient.listByIds(ids);
            byId.setAppUserList(appUserList);
        }