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 @@
 				<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>
 				<% if(hasPermi('sys:corpAdmin:edit')){ %>
 					<% if(useCorpModel){ %>
-					<a href="${ctx}/sys/corpAdmin/form?op=addCorp" class="btn btn-default btnTool" title=" ${text('新增管理员')}"><i class="fa fa-plus"></i> ${text('新增管理员')}</a>
+					<a href="${ctx}/sys/corpAdmin/form?op=addCorp" class="btn btn-default btnTool" title=" ${text('新增管理员')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
 					<% }else{ %>
-					<a href="${ctx}/sys/corpAdmin/form?corpCode_=${user.currentUser.corpCode_}&corpName_=${user.currentUser.corpName_}&op=addAdmin" class="btn btn-default btnTool" title="${text('新增管理员')}"><i class="fa fa-plus"></i> ${text('新增管理员')}</a>
+					<a href="${ctx}/sys/corpAdmin/form?corpCode_=${currentCorpCode}&corpName_=${currentCorpName}&op=addAdmin" class="btn btn-default btnTool" title="${text('新增管理员')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
 					<% } %>
 				<% } %>
 				<a href="#" class="btn btn-default" id="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>