From ac4c092a1cbe57a3d3e4551b0284be25ff107107 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 28 Sep 2020 15:12:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=9B=E5=9E=8B=E5=87=BD=E6=95=B0=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=B1=BB=E5=9E=8B=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jeesite/modules/sys/entity/EmpUser.java   | 2 +-
 .../src/main/java/com/jeesite/modules/sys/utils/EmpUtils.java   | 2 +-
 web/db/mysql/create_user.sql                                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java
index fcee6a45..510a6806 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java
@@ -107,7 +107,7 @@ public class EmpUser extends User {
 		@ExcelField(title="最后登录", attrName="lastLoginDate", align=Align.CENTER, words=20, sort=900, type=ExcelField.Type.EXPORT),
 	})
 	public Employee getEmployee(){
-		Employee employee = (Employee)super.getRefObj();
+		Employee employee = super.getRefObj();
 		if (employee == null){
 			employee = new Employee(getRefCode());
 			super.setRefObj(employee);
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/utils/EmpUtils.java b/modules/core/src/main/java/com/jeesite/modules/sys/utils/EmpUtils.java
index 267457a9..765a0368 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/utils/EmpUtils.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/utils/EmpUtils.java
@@ -54,7 +54,7 @@ public class EmpUtils {
 	 */
 	public static Employee get(User user){
 		if (user != null && User.USER_TYPE_EMPLOYEE.equals(user.getUserType())){
-			return (Employee)user.getRefObj();
+			return user.getRefObj();
 		}
 		return null;
 	}
diff --git a/web/db/mysql/create_user.sql b/web/db/mysql/create_user.sql
index 0c947cbf..279d7944 100644
--- a/web/db/mysql/create_user.sql
+++ b/web/db/mysql/create_user.sql
@@ -6,7 +6,7 @@ set global read_only=0;
 
 create user 'jeesite'@'%' identified by 'jeesite';
 
-create database jeesite DEFAULT CHARSET 'utf8' COLLATE 'utf8_unicode_ci'; 
+create database jeesite DEFAULT CHARSET 'utf8' COLLATE 'utf8_general_ci'; 
 
 grant all privileges on jeesite.* to 'jeesite'@'%' identified by 'jeesite';