|  | @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 | 
	
		
			
				|  |  |  import com.baomidou.mybatisplus.core.metadata.IPage;
 | 
	
		
			
				|  |  |  import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 | 
	
		
			
				|  |  |  import com.zanxiang.manage.domain.params.UserNameAuthListParam;
 | 
	
		
			
				|  |  | +import com.zanxiang.manage.domain.vo.UserCardVO;
 | 
	
		
			
				|  |  |  import com.zanxiang.manage.domain.vo.UserNameAuthVO;
 | 
	
		
			
				|  |  |  import com.zanxiang.manage.service.UserCardService;
 | 
	
		
			
				|  |  |  import com.zanxiang.module.util.bean.BeanUtil;
 | 
	
	
		
			
				|  | @@ -33,7 +34,7 @@ public class UserCardServiceImpl extends ServiceImpl<UserCardMapper, UserCard> i
 | 
	
		
			
				|  |  |       * @return : 返回单页数据
 | 
	
		
			
				|  |  |       */
 | 
	
		
			
				|  |  |      @Override
 | 
	
		
			
				|  |  | -    public IPage<UserNameAuthVO> authList(UserNameAuthListParam param) {
 | 
	
		
			
				|  |  | +    public IPage<UserCardVO> getUserCardList(UserNameAuthListParam param) {
 | 
	
		
			
				|  |  |          return page(param.toPage(), new QueryWrapper<UserCard>().lambda()
 | 
	
		
			
				|  |  |                  .eq(param.getUserId() != null, UserCard::getUserId, param.getUserId())
 | 
	
		
			
				|  |  |                  .eq(Strings.isNotBlank(param.getUsername()), UserCard::getUsername, param.getUsername())
 | 
	
	
		
			
				|  | @@ -46,21 +47,17 @@ public class UserCardServiceImpl extends ServiceImpl<UserCardMapper, UserCard> i
 | 
	
		
			
				|  |  |                  .convert(this::toVo);
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |      /**
 | 
	
		
			
				|  |  |       * 对象转换
 | 
	
		
			
				|  |  |       *
 | 
	
		
			
				|  |  |       * @param userCard 用户卡片
 | 
	
		
			
				|  |  |       * @return {@link UserNameAuthVO}
 | 
	
		
			
				|  |  |       */
 | 
	
		
			
				|  |  | -    private UserNameAuthVO toVo(UserCard userCard) {
 | 
	
		
			
				|  |  | +    private UserCardVO toVo(UserCard userCard) {
 | 
	
		
			
				|  |  |          if (Objects.isNull(userCard)) {
 | 
	
		
			
				|  |  |              return null;
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | -        UserNameAuthVO vo = BeanUtil.copy(userCard, UserNameAuthVO.class);
 | 
	
		
			
				|  |  | -        vo.setCreateTime(userCard.getRegTime());
 | 
	
		
			
				|  |  | -        vo.setRealName(userCard.getCardName());
 | 
	
		
			
				|  |  | -        vo.setAuthTime(userCard.getCreateTime());
 | 
	
		
			
				|  |  | -        return vo;
 | 
	
		
			
				|  |  | +        return BeanUtil.copy(userCard, UserCardVO.class);
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  }
 |