From 1f9c7e4a5077b88d13b366c8cdebda6add80a0b8 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 18 Feb 2020 12:47:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=A7=86=E5=9B=BE=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E4=BC=98=E5=8C=96=EF=BC=8C=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9D=A5=E6=BA=90=E9=A1=B5=E9=9D=A2=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/web/LoginController.java      | 22 ++++++++++---------
 .../themes/default/modules/sys/sysLogin.html  |  2 +-
 2 files changed, 13 insertions(+), 11 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 5127f076..6e358a14 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
@@ -105,11 +105,12 @@ public class LoginController extends BaseController{
 		
 		// 返回指定用户类型的登录页视图
 		String userType = (String)paramMap.get("userType");
-		if (StringUtils.isNotBlank(userType)){
-			String view = UserUtils.getUserTypeValue(userType, "loginView");
-			if(StringUtils.isNotBlank(view)){
-				return view;
-			}
+		if (StringUtils.isBlank(userType)){
+			userType = User.USER_TYPE_EMPLOYEE;
+		}
+		String view = UserUtils.getUserTypeValue(userType, "loginView");
+		if(StringUtils.isNotBlank(view)){
+			return view;
 		}
 		
 		return "modules/sys/sysLogin";
@@ -177,11 +178,12 @@ public class LoginController extends BaseController{
 		
 		// 返回指定用户类型的登录页视图
 		String userType = (String)paramMap.get("userType");
-		if (StringUtils.isNotBlank(userType)){
-			String view = UserUtils.getUserTypeValue(userType, "loginView");
-			if(StringUtils.isNotBlank(view)){
-				return view;
-			}
+		if (StringUtils.isBlank(userType)){
+			userType = User.USER_TYPE_EMPLOYEE;
+		}
+		String view = UserUtils.getUserTypeValue(userType, "loginView");
+		if(StringUtils.isNotBlank(view)){
+			return view;
 		}
 		
 		return "modules/sys/sysLogin";
diff --git a/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html b/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html
index 2553ad4e..63c37628 100644
--- a/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html
+++ b/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html
@@ -10,7 +10,7 @@
 	</div>
 	<div class="login-box-body">
 		<#form:form id="loginForm" model="${user!}" action="${ctx}/login" method="post">
-			<h4 class="login-box-msg">${text('欢迎回来')}！</h4>
+			<h4 class="login-box-msg">${isNotBlank(message!)?message:text('欢迎回来')+'！'}</h4>
 			<div class="form-group has-feedback">
 				<span class="glyphicon glyphicon-user form-control-feedback" title="${text('登录账号')}"></span>
 				<#form:input type="text" name="username" class="form-control required"