From fe3436665e1467d7c71b1e7a26c8fef70bd9a89a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 3 Sep 2021 23:05:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsh/erp/controller/FunctionController.java     | 6 ++----
 .../java/com/jsh/erp/controller/SystemConfigController.java | 4 ++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/FunctionController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/FunctionController.java
index fc8c3c5b..4bd5bad9 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/FunctionController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/FunctionController.java
@@ -161,16 +161,14 @@ public class FunctionController {
                 item.put("value", function.getId());
                 item.put("title", function.getName());
                 item.put("attributes", function.getName());
-                Boolean flag = ubValue.contains("[" + function.getId().toString() + "]");
-                if (flag) {
-                    item.put("checked", true);
-                }
                 List<Function> funList = functionService.findRoleFunction(function.getNumber());
                 if(funList.size()>0) {
                     JSONArray funArr = getFunctionList(funList, type, keyId);
                     item.put("children", funArr);
                     dataArray.add(item);
                 } else {
+                    Boolean flag = ubValue.contains("[" + function.getId().toString() + "]");
+                    item.put("checked", flag);
                     dataArray.add(item);
                 }
             }
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/SystemConfigController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/SystemConfigController.java
index a8feed9a..bc87cc37 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/SystemConfigController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/SystemConfigController.java
@@ -13,6 +13,7 @@ import com.jsh.erp.service.userBusiness.UserBusinessService;
 import com.jsh.erp.utils.BaseResponseInfo;
 import com.jsh.erp.utils.FileUtils;
 import com.jsh.erp.utils.StringUtil;
+import com.jsh.erp.utils.Tools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -126,6 +127,9 @@ public class SystemConfigController {
             if(StringUtil.isEmpty(bizPath)){
                 bizPath = "";
             }
+            String token = request.getHeader("X-Access-Token");
+            Long tenantId = Tools.getTenantIdByToken(token);
+            bizPath = bizPath + File.separator + tenantId;
             savePath = this.uploadLocal(file,bizPath);
             if(StringUtil.isNotEmpty(savePath)){
                 res.code = 200;