From e5e3d209b61d6c22cab8f9f213a790daed59096d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 14 Sep 2020 00:09:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E7=94=A8=E6=88=B7=E8=8E=B7=E5=8F=96=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=91=98=E6=95=B0=E7=BB=84-=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/controller/DepotHeadController.java   | 26 +++++++++++++++++++
 .../service/depotHead/DepotHeadService.java   | 23 +++++++++++-----
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/src/main/java/com/jsh/erp/controller/DepotHeadController.java
index 6e70802e..ce31fa93 100644
--- a/src/main/java/com/jsh/erp/controller/DepotHeadController.java
+++ b/src/main/java/com/jsh/erp/controller/DepotHeadController.java
@@ -440,4 +440,30 @@ public class DepotHeadController {
         }
         return res;
     }
+
+    /**
+     * 根据当前用户获取操作员数组，用于控制当前用户的数据权限，限制可以看到的单据范围
+     * 注意：该接口提供给部分插件使用，勿删
+     * @param request
+     * @return
+     */
+    @GetMapping(value = "/getCreatorByCurrentUser")
+    public BaseResponseInfo getCreatorByRoleType(HttpServletRequest request) {
+        BaseResponseInfo res = new BaseResponseInfo();
+        Map<String, Object> map = new HashMap<String, Object>();
+        try {
+            String creator = "";
+            Object roleType = request.getSession().getAttribute("roleType");
+            if(roleType!=null) {
+                creator = depotHeadService.getCreatorByRoleType(roleType.toString());
+            }
+            res.code = 200;
+            res.data = creator;
+        } catch (Exception e) {
+            e.printStackTrace();
+            res.code = 500;
+            res.data = "获取数据失败";
+        }
+        return res;
+    }
 }
diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
index 694334f3..25874b98 100644
--- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
+++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
@@ -140,7 +140,22 @@ public class DepotHeadService {
      * @return
      * @throws Exception
      */
-    private String[] getCreatorArray(String roleType) throws Exception {
+    public String[] getCreatorArray(String roleType) throws Exception {
+        String creator = getCreatorByRoleType(roleType);
+        String [] creatorArray=null;
+        if(StringUtil.isNotEmpty(creator)){
+            creatorArray = creator.split(",");
+        }
+        return creatorArray;
+    }
+
+    /**
+     * 根据角色类型获取操作员
+     * @param roleType
+     * @return
+     * @throws Exception
+     */
+    public String getCreatorByRoleType(String roleType) throws Exception {
         String creator = "";
         User user = userService.getCurrentUser();
         if(BusinessConstants.ROLE_TYPE_PRIVATE.equals(roleType)) {
@@ -148,11 +163,7 @@ public class DepotHeadService {
         } else if(BusinessConstants.ROLE_TYPE_THIS_ORG.equals(roleType)) {
             creator = orgaUserRelService.getUserIdListByUserId(user.getId());
         }
-        String [] creatorArray=null;
-        if(StringUtil.isNotEmpty(creator)){
-            creatorArray = creator.split(",");
-        }
-        return creatorArray;
+        return creator;
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)