diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/DuplicateCheckController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/DuplicateCheckController.java
index 74e71fe8..03a237b5 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/DuplicateCheckController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/DuplicateCheckController.java
@@ -1,21 +1,20 @@
 package com.jero.modules.system.controller;
 
-import javax.servlet.http.HttpServletRequest;
-
 import com.jero.common.api.vo.Results;
 import com.jero.common.util.PasswordUtil;
-import org.apache.commons.lang.StringUtils;
 import com.jero.common.util.SqlInjectionUtil;
 import com.jero.modules.system.mapper.SysDictMapper;
 import com.jero.modules.system.model.DuplicateCheckVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * @Title: DuplicateCheckAction
@@ -48,7 +47,7 @@ public class DuplicateCheckController {
 		//SQL注入校验（只限制非法串改数据库）
 		final String[] sqlInjCheck = {duplicateCheckVo.getTableName(),duplicateCheckVo.getFieldName()};
 		SqlInjectionUtil.filterContent(sqlInjCheck);
-		if ("phone".equals(duplicateCheckVo.getFieldName())) {
+		if ("phone".equals(duplicateCheckVo.getFieldName()) || "email".equals(duplicateCheckVo.getFieldName())) {
 			if (StringUtils.isNotBlank(duplicateCheckVo.getFieldVal())) {
 				duplicateCheckVo.setFieldVal(PasswordUtil.encrypt(duplicateCheckVo.getFieldVal()));
 			}
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java
index 31a42a8c..19ae25b6 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java
@@ -146,7 +146,9 @@ public class LoginServiceImpl implements ILoginService {
         //update-begin--Author:wangshuai  Date:20200714  for：登录日志没有记录人员
         LoginUser loginUser = new LoginUser();
         BeanUtils.copyProperties(sysUser, loginUser);
-        baseCommonService.addLog(USER_NAME + username + ",登录成功！", CommonConstant.LOG_TYPE_1, null,loginUser);
+        baseCommonService.addLog(USER_NAME + sysUser.getRealname() + "（"+username+"）,登录成功！",
+                CommonConstant.LOG_TYPE_1, null,
+                loginUser);
         //update-end--Author:wangshuai  Date:20200714  for：登录日志没有记录人员
         return result;
 
@@ -191,7 +193,9 @@ public class LoginServiceImpl implements ILoginService {
         LoginUser sysUser = sysBaseAPI.getUserByName(username);
         if(sysUser!=null) {
             //update-begin--Author:wangshuai  Date:20200714  for：登出日志没有记录人员
-            baseCommonService.addLog(USER_NAME+sysUser.getRealname()+",退出成功！", CommonConstant.LOG_TYPE_1, null,sysUser);
+            baseCommonService.addLog(USER_NAME+sysUser.getRealname()+"（"+sysUser.getUsername()+"）,退出成功！",
+                    CommonConstant.LOG_TYPE_1, null,
+                    sysUser);
             //update-end--Author:wangshuai  Date:20200714  for：登出日志没有记录人员
             log.info(" 用户名:  "+sysUser.getRealname()+",退出成功！ ");
             //清空用户登录Token缓存