From 5bfc6f24bbf421d2771fac31076f32103f45c517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 29 Mar 2023 22:34:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=8D=E4=BB=8E=E5=90=8E=E7=AB=AF=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=B8=80=E6=AC=A1=E8=A7=92=E8=89=B2=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=89=8D=E7=AB=AF=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E4=BA=86=E7=BC=93=E5=AD=98=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/service/accountHead/AccountHeadService.java   | 4 ++++
 .../java/com/jsh/erp/service/depotHead/DepotHeadService.java  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
index 79e1f397..104bc247 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
@@ -144,6 +144,10 @@ public class AccountHeadService {
     private String[] getCreatorArray(String roleType) throws Exception {
         String creator = "";
         User user = userService.getCurrentUser();
+        //再从后端获取一次角色类型，防止前端关闭了缓存功能
+        if(StringUtil.isEmpty(roleType)) {
+            roleType = userService.getRoleTypeByUserId(user.getId()).getType(); //角色类型
+        }
         if(BusinessConstants.ROLE_TYPE_PRIVATE.equals(roleType)) {
             creator = user.getId().toString();
         } else if(BusinessConstants.ROLE_TYPE_THIS_ORG.equals(roleType)) {
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
index 319056bf..b0b173da 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
@@ -294,6 +294,10 @@ public class DepotHeadService {
     public String getCreatorByRoleType(String roleType) throws Exception {
         String creator = "";
         User user = userService.getCurrentUser();
+        //再从后端获取一次角色类型，防止前端关闭了缓存功能
+        if(StringUtil.isEmpty(roleType)) {
+            roleType = userService.getRoleTypeByUserId(user.getId()).getType(); //角色类型
+        }
         if(BusinessConstants.ROLE_TYPE_PRIVATE.equals(roleType)) {
             creator = user.getId().toString();
         } else if(BusinessConstants.ROLE_TYPE_THIS_ORG.equals(roleType)) {