|
@@ -116,12 +116,12 @@ public class ShopMoneyController extends AbstractController {
|
|
|
map.put("limit",limit);
|
|
map.put("limit",limit);
|
|
|
if(shopId!=null){
|
|
if(shopId!=null){
|
|
|
GoodsShop goodsShop = goodsShopDao.selectById(shopId);
|
|
GoodsShop goodsShop = goodsShopDao.selectById(shopId);
|
|
|
- map.put("userId",goodsShop.getUserId());
|
|
|
|
|
|
|
+ map.put("userId",goodsShop.getUserId().toString());
|
|
|
}else{
|
|
}else{
|
|
|
SysUserEntity user = getUser();
|
|
SysUserEntity user = getUser();
|
|
|
Long adminUserId = user.getUserId();
|
|
Long adminUserId = user.getUserId();
|
|
|
UserEntity userEntity = userDao.selectOne(new QueryWrapper<UserEntity>().eq("admin_user_id", adminUserId));
|
|
UserEntity userEntity = userDao.selectOne(new QueryWrapper<UserEntity>().eq("admin_user_id", adminUserId));
|
|
|
- map.put("userId",userEntity.getUserId());
|
|
|
|
|
|
|
+ map.put("userId",userEntity.getUserId().toString());
|
|
|
}
|
|
}
|
|
|
PageUtils pageUtils = cashOutService.selectCashOutList(map);
|
|
PageUtils pageUtils = cashOutService.selectCashOutList(map);
|
|
|
return Result.success().put("data",pageUtils);
|
|
return Result.success().put("data",pageUtils);
|