From 1b0099c8317f74dd5461d344c5db61b22bd924df Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 23 Apr 2019 22:57:11 +0800
Subject: [PATCH] update

---
 .../src/main/java/com/jeesite/common/io/PropertiesUtils.java   | 3 +--
 .../src/main/java/com/jeesite/modules/sys/utils/EmpUtils.java  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java b/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java
index b4e71341..b92e9da5 100644
--- a/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java
+++ b/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java
@@ -16,7 +16,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
 import org.springframework.core.env.Environment;
-import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.Resource;
 
 import com.jeesite.common.collect.SetUtils;
@@ -215,7 +214,7 @@ public class PropertiesUtils {
 		String logPath = null;
 		try {
 			// 获取当前classes目录
-			logPath = new DefaultResourceLoader().getResource("/").getFile().getPath();
+			logPath = ResourceUtils.getResource("/").getFile().getPath();
 		} catch (Exception e) {
 			// 取不到，取当前工作路径
 			logPath = System.getProperty("user.dir");
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 67f7be21..27526cb1 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
@@ -45,7 +45,7 @@ public class EmpUtils {
 		User user = UserUtils.getUser();
 		Employee employee = null;
 		if (User.USER_TYPE_EMPLOYEE.equals(user.getUserType())){
-			employee = (Employee)UserUtils.getUser().getRefObj();
+			employee = (Employee)user.getRefObj();
 		}
 		if (employee == null){
 			employee = new Employee();