Merge branch 'wallet_detail' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserSellingWaterBiz.java

 package com.github.wxiaoqi.security.admin.biz;
 
 import com.github.wxiaoqi.security.admin.bo.UserIncomeBo;
-import com.github.wxiaoqi.security.admin.bo.UserStaffBo;
 import com.github.wxiaoqi.security.admin.dto.*;
 import com.github.wxiaoqi.security.admin.entity.*;
-import com.github.wxiaoqi.security.admin.entity.AppUserRelation;
-import com.github.wxiaoqi.security.admin.vo.SellingWalletVo;
+import com.github.wxiaoqi.security.admin.mapper.AppUserSellingWaterMapper;
 import com.github.wxiaoqi.security.admin.vo.SellingWalletPagVo;
+import com.github.wxiaoqi.security.admin.vo.SellingWalletVo;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.github.wxiaoqi.security.admin.mapper.AppUserSellingWaterMapper;
-import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
@@ -352,7 +350,7 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
             sellingWaterVo = new SellingWalletVo();
             BeanUtils.copyProperties(appUserSellingWater, sellingWaterVo);
 
-            sellingWaterVo.setUsername(userIdAndAppUserLoginMap.get(appUserSellingWater.getSourceId()).getUsername());
+            sellingWaterVo.setUsername(userIdAndAppUserLoginMap.get(appUserSellingWater.getSourceId())==null?"":userIdAndAppUserLoginMap.get(appUserSellingWater.getSourceId()).getUsername());
             if (userIdAndAppUserDetailMap != null) {
                 AppUserDetail appUserDetail = userIdAndAppUserDetailMap.get(appUserSellingWater.getSourceId());
                 sellingWaterVo.setNickName(appUserDetail == null ? "" : appUserDetail.getNickname());