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';