manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

泛型函数返回类型优化

Browse Source
This commit is contained in:
thinkgem
2020-09-28 15:12:03 +08:00
parent 4e6e22e4dc
commit ac4c092a1c
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java
View File

@@ -107,7 +107,7 @@ public class EmpUser extends User {
@ExcelField(title="最后登录", attrName="lastLoginDate", align=Align.CENTER, words=20, sort=900, type=ExcelField.Type.EXPORT), @ExcelField(title="最后登录", attrName="lastLoginDate", align=Align.CENTER, words=20, sort=900, type=ExcelField.Type.EXPORT),
}) })
public Employee getEmployee(){ public Employee getEmployee(){
Employee employee = (Employee)super.getRefObj(); Employee employee = super.getRefObj();
if (employee == null){ if (employee == null){
employee = new Employee(getRefCode()); employee = new Employee(getRefCode());
super.setRefObj(employee); super.setRefObj(employee);

2
modules/core/src/main/java/com/jeesite/modules/sys/utils/EmpUtils.java
View File

@@ -54,7 +54,7 @@ public class EmpUtils {
*/ */
public static Employee get(User user){ public static Employee get(User user){
if (user != null && User.USER_TYPE_EMPLOYEE.equals(user.getUserType())){ if (user != null && User.USER_TYPE_EMPLOYEE.equals(user.getUserType())){
return (Employee)user.getRefObj(); return user.getRefObj();
} }
return null; return null;
} }

2
web/db/mysql/create_user.sql
View File

@@ -6,7 +6,7 @@ set global read_only=0;
create user 'jeesite'@'%' identified by 'jeesite'; 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'; grant all privileges on jeesite.* to 'jeesite'@'%' identified by 'jeesite';