Merge remote-tracking branch 'origin/master-v2' into master-v2

cloudroam

2024-10-12 24e21f8ce1a28a78a58f9a95cc6438b4a9c737a6

 src/main/java/com/mzl/flower/service/menber/impl/MemberServiceImpl.java

@@ -9,13 +9,16 @@
import com.mzl.flower.dto.request.menber.MemberQueryDTO;
import com.mzl.flower.dto.response.member.MemberVO;
import com.mzl.flower.entity.menber.Member;
import com.mzl.flower.entity.system.User;
import com.mzl.flower.mapper.customer.CustomerMapper;
import com.mzl.flower.mapper.member.MemberMapper;
import com.mzl.flower.service.menber.MemberService;
import com.mzl.flower.service.system.UserService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;

@@ -37,6 +40,8 @@
    private final MemberMapper memberMapper;

    private final CustomerMapper customerMapper;

    private final UserService  userService;

    @Override
    public void saveMember(MemberDTO memberDTO) {
@@ -210,6 +215,16 @@
    @Override
    public Page<MemberVO> queryPage(MemberQueryDTO memberQueryDTO, Page page) {
        List<MemberVO> list = memberMapper.queryPage(memberQueryDTO, page);
        if(!CollectionUtils.isEmpty(list)){
            list.forEach(l->{
                if (!StringUtils.isEmpty(l.getUpdateBy())) {
                    User userById = userService.getUserById(l.getUpdateBy());
                    if(!ObjectUtils.isEmpty(userById)){
                        l.setCreateName(userById.getNickName());
                    }
                }
            });
        }
        page.setRecords(list);
        return page;
    }