From 0b342b923cbec6ca293a98dd192b40c0fd2c12db Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Mar 2022 11:40:16 +0800
Subject: [PATCH] fix some problem and data premission

---
 src/main/java/cc/mrbird/febs/dapp/controller/MemberWalletController.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/MemberWalletController.java b/src/main/java/cc/mrbird/febs/dapp/controller/MemberWalletController.java
index c5527f4..694e8b0 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/MemberWalletController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/MemberWalletController.java
@@ -3,9 +3,11 @@
 import cc.mrbird.febs.common.controller.BaseController;
 import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.common.utils.FebsUtil;
 import cc.mrbird.febs.dapp.entity.DappWalletCoinEntity;
 import cc.mrbird.febs.dapp.entity.DappWalletMineEntity;
 import cc.mrbird.febs.dapp.service.DappWalletService;
+import cc.mrbird.febs.system.entity.User;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
@@ -27,11 +29,19 @@
 
     @RequestMapping(value  = "/walletCoin")
     public FebsResponse walletCoin(DappWalletCoinEntity walletCoin, QueryRequest request) {
+        User currentUser = FebsUtil.getCurrentUser();
+        if (currentUser.getDeptId() == null) {
+            walletCoin.setCurrentUser(currentUser.getUserId());
+        }
         return new FebsResponse().success().data(getDataTable(dappWalletService.walletCoinInPage(walletCoin, request)));
     }
 
     @RequestMapping(value  = "/walletMine")
     public FebsResponse walletMine(DappWalletMineEntity walletMine, QueryRequest request) {
+        User currentUser = FebsUtil.getCurrentUser();
+        if (currentUser.getDeptId() == null) {
+            walletMine.setCurrentUser(currentUser.getUserId());
+        }
         return new FebsResponse().success().data(getDataTable(dappWalletService.walletMineInPage(walletMine, request)));
     }
 }

--
Gitblit v1.9.1