From cb8a4d2f7369e2046af345035b9f46f2674e7a72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=93=E6=BA=90=E8=BD=AF=E4=BB=B6?= <thinkgem@163.com>
Date: Sat, 14 May 2022 01:38:26 +0000
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E7=A6=BB=E7=AB=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=9C=80=E8=A6=81=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/modules/sys/web/LoginController.java | 12 +++++++++---
 .../modules/sys/web/user/CorpAdminController.java    |  9 ++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
index 00b75cb1..aff6d979 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
@@ -33,6 +33,7 @@ import com.jeesite.common.web.CookieUtils;
 import com.jeesite.common.web.http.ServletUtils;
 import com.jeesite.modules.sys.entity.Menu;
 import com.jeesite.modules.sys.entity.User;
+import com.jeesite.modules.sys.utils.CorpUtils;
 import com.jeesite.modules.sys.utils.PwdUtils;
 import com.jeesite.modules.sys.utils.UserUtils;
 
@@ -189,12 +190,17 @@ public class LoginController extends BaseController{
 			ServletUtils.redirectUrl(request, response, adminPath + "/login" + queryString);
 			return null;
 		}
+		
+		// 获取当前会话对象，并返回一些数据
+		Session session = UserUtils.getSession();
+		model.addAttribute("user", user); // 设置当前用户信息
 		model.addAttribute("user", user); // 设置当前用户信息
 		model.addAttribute("demoMode", Global.isDemoMode());
+		model.addAttribute("useCorpModel", Global.isUseCorpModel());
+		model.addAttribute("currentCorpCode", CorpUtils.getCurrentCorpCode());
+		model.addAttribute("currentCorpName", CorpUtils.getCurrentCorpName());
+		model.addAttribute("sysCode", session.getAttribute("sysCode"));
 
-		//获取当前会话对象
-		Session session = UserUtils.getSession();
-		
 		// 是否是登录操作
 		boolean isLogin = Global.TRUE.equals(session.getAttribute(BaseAuthorizingRealm.IS_LOGIN_OPER));
 		if (isLogin){
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 b25872dd..dbb758e5 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); // 仅登录用户