From 89e17a219d8a6d208e4cb32a43e90abb89b3c93b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 25 Jan 2021 16:17:26 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java |   34 ++++++++++++++++++++++++++++++++--
 1 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java
index f1b1260..8a8dbd6 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java
@@ -139,15 +139,34 @@
         SysUsers loginUser = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
         loginUser.setCreateBy(loginUser.getSuName());
         sysUsers.setCompanyId(loginUser.getCompanyId());
-        sysUsers.setShopId(loginUser.getShopId());
         int i = sysUsersService.addAdmin(sysUsers);
-
         if (i > 0) {
             return new AjaxResult(AjaxResult.STATUS_SUCCESS, SystemMessageCode.ADD_SUCCES, AppVocabularyCode.ADMIN);
         } else {
             throw new GlobleException(SystemErrorCode.DATA_ADD_FAIL);
         }
     }
+
+    /**
+     * 新增门店管理员
+     */
+    @RemoveRequestToken
+    @PostMapping(value = "/addShopAdmin")
+    public @ResponseBody
+    AjaxResult addShopAdmin(SysUsers sysUsers) {
+
+        SysUsers loginUser = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+        loginUser.setCreateBy(loginUser.getSuName());
+        sysUsers.setCompanyId(loginUser.getCompanyId());
+        sysUsers.setShopId(loginUser.getShopId());
+        int i = sysUsersService.addAdmin(sysUsers);
+        if (i > 0) {
+            return new AjaxResult(AjaxResult.STATUS_SUCCESS, SystemMessageCode.ADD_SUCCES, AppVocabularyCode.ADMIN);
+        } else {
+            throw new GlobleException(SystemErrorCode.DATA_ADD_FAIL);
+        }
+    }
+
 
     /**
      * 修改公司管理员
@@ -177,6 +196,8 @@
             throw new GlobleException(SystemErrorCode.DATA_UPDATE_FAIL);
         }
     }
+
+
 
 
     @RequestMapping(value = "/goStaffEditForm")
@@ -414,6 +435,15 @@
         return result;
     }
 
+    @RequestMapping(value = "/getUserById")
+    public @ResponseBody
+    AjaxResult getUserById(Long id) {
+        AjaxResult result = AjaxResult.buildSuccessInstance("");
+        SysUsers user = sysUsersService.findById(id);
+        result.putInMap("user", user);
+        return result;
+    }
+
 
     /**
      * 条件查询所有员工,不分页

--
Gitblit v1.9.1