From 6a34e239e8cd26c74e3d51860d14ebfe87999d97 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 20 Jan 2021 09:19:19 +0800
Subject: [PATCH] 修改门店添加用户没有shopId的问题
---
zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java | 23 +++++++++++++++++++++++
zq-erp/src/main/resources/templates/views/admin/hive-erp/vip/vipInfo-list.html | 2 +-
zq-erp/src/main/resources/templates/views/admin/sys/admin-form.html | 2 +-
3 files changed, 25 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 18b77fa..0b38d90 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
@@ -148,6 +148,27 @@
}
/**
+ * 新增门店管理员
+ */
+ @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 +198,8 @@
}
+
+
@RequestMapping(value = "/goStaffEditForm")
public String goStaffEditForm() {
SysUsers loginUser = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/vip/vipInfo-list.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/vip/vipInfo-list.html
index 0354078..0d71ddc 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/vip/vipInfo-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/vip/vipInfo-list.html
@@ -96,7 +96,7 @@
</select>
</div>
<div class="form-group">
- <button matrix:btn="mdhyzl-add" onclick="myGrid.serchData(1)" type="button"
+ <button onclick="myGrid.serchData(1)" type="button"
class="btn btn-sm btn-info">
<i class="fa fa-search "></i> 搜索
</button>
diff --git a/zq-erp/src/main/resources/templates/views/admin/sys/admin-form.html b/zq-erp/src/main/resources/templates/views/admin/sys/admin-form.html
index a56d2cb..a797e09 100644
--- a/zq-erp/src/main/resources/templates/views/admin/sys/admin-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/sys/admin-form.html
@@ -234,7 +234,7 @@
<script type="text/javascript" th:src="@{/js/systools/MJsBase.js}"></script>
<script th:inline="javascript">
- var invokeUrl=basePath +"/admin/addAdmin";
+ var invokeUrl=basePath +"/admin/addShopAdmin";
/*<![CDATA[*/
var obj=/*[[${obj}]]*/
/*]]>*/
--
Gitblit v1.9.1