From 29ba6fbd0015b9a77b5c994f43429a5a42e2ecc4 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 17 Jan 2021 11:35:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api
---
zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java | 2 --
1 files changed, 0 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..18b77fa 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,9 +139,7 @@
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 {
--
Gitblit v1.9.1