From 22751ae9e81468a1236d499b4809df24a33b56a8 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sun, 8 May 2022 16:20:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/sys/web/user/CorpAdminController.java | 11 +++++++---- .../modules/sys/web/user/SecAdminController.java | 4 ++-- .../main/resources/views/modules/sys/sysDesktop.html | 4 +++- .../views/modules/sys/user/corpAdminList.html | 4 ++-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java index 5b9c87df..c144cf19 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java @@ -63,6 +63,8 @@ public class CorpAdminController extends BaseController { user.setCorpCode(null); user.setCorpName(null); model.addAttribute("user", user); + model.addAttribute("currentCorpCode", user.getCurrentUser().getCorpCode_()); + model.addAttribute("currentCorpName", user.getCurrentUser().getCorpName_()); model.addAttribute("useCorpModel", Global.getConfigToBoolean("user.useCorpModel", "false")); return "modules/sys/user/corpAdminList"; } @@ -108,7 +110,7 @@ public class CorpAdminController extends BaseController { @RequiresPermissions("sys:corpAdmin:edit") @PostMapping(value = "save") @ResponseBody - public String save(@Validated User user, String oldLoginCode, String op) { + public String save(@Validated User user, String op, HttpServletRequest request) { if (!user.getCurrentUser().isSuperAdmin()){ return renderResult(Global.FALSE, text("越权操作，只有超级管理员才能修改此数据！")); } @@ -121,8 +123,9 @@ public class CorpAdminController extends BaseController { if (StringUtils.isBlank(user.getCorpCode_())){ return renderResult(Global.FALSE, text("租户代码不能为空！")); } - if (!Global.TRUE.equals(userService.checkLoginCode(oldLoginCode, user.getLoginCode()))) { - return renderResult(Global.FALSE, text("保存管理员''{0}''失败，登录账号已存在", user.getLoginCode())); + User old = super.getWebDataBinderSource(request); + if (!Global.TRUE.equals(userService.checkLoginCode(old != null ? old.getLoginCode() : "", user.getLoginCode()))) { + return renderResult(Global.FALSE, text("保存管理员失败，登录账号''{0}''已存在", user.getLoginCode())); } if (user.getIsNewRecord()){ user.setUserType(User.USER_TYPE_NONE); // 仅登录用户 @@ -264,7 +267,7 @@ public class CorpAdminController extends BaseController { /** * 切换租户 - * @param user + * @param corpCode * @return */ @RequiresPermissions("sys:corpAdmin:edit") diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/SecAdminController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/SecAdminController.java index b90e5f06..d54a8d2e 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/SecAdminController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/SecAdminController.java @@ -67,7 +67,7 @@ public class SecAdminController extends BaseController { @RequiresPermissions("sys:secAdmin:view") @RequestMapping(value = "form") - public String form(User user, String op, Model model) { + public String form(User user, Model model) { UserDataScope userDataScope = new UserDataScope(); userDataScope.setUserCode(user.getUserCode()); userDataScope.setCtrlPermi(UserDataScope.CTRL_PERMI_MANAGE); @@ -88,7 +88,7 @@ public class SecAdminController extends BaseController { @RequiresPermissions("sys:secAdmin:edit") @PostMapping(value = "save") @ResponseBody - public String save(@Validated User user, String op) { + public String save(@Validated User user) { if (User.isSuperAdmin(user.getUserCode())) { return renderResult(Global.FALSE, text("非法操作，不能够操作此用户！")); } diff --git a/modules/core/src/main/resources/views/modules/sys/sysDesktop.html b/modules/core/src/main/resources/views/modules/sys/sysDesktop.html index bff49df5..82488724 100644 --- a/modules/core/src/main/resources/views/modules/sys/sysDesktop.html +++ b/modules/core/src/main/resources/views/modules/sys/sysDesktop.html @@ -110,7 +110,9 @@ type : 'value' } ], - //color: ['#FAD860','#F3A43B','#60C0DD','#C6E579'], + color: [ + '#5470c6','#ee6666','#73c0de','#3ba272','#9a60b4' + ], series : [ { name:'成交', diff --git a/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html index 49b849a9..fa1f83c8 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html +++ b/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html @@ -9,9 +9,9 @@ ${text('查询')} <% if(hasPermi('sys:corpAdmin:edit')){ %> <% if(useCorpModel){ %> - ${text('新增管理员')} + ${text('新增')} <% }else{ %> - ${text('新增管理员')} + ${text('新增')} <% } %> <% } %>