diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java
index ab556ea..d23f054 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java
@@ -86,7 +86,7 @@ public class SystemUserAuthController {
 				.eq(SystemUser::getAccount, Aes.decrypt(systemUser.getAccount()))
 				.eq(SystemUser::getShowPassword, Aes.decrypt(systemUser.getShowPassword())));
 		SystemUserAuthDto userInfo = new SystemUserAuthDto();
-		checkLogin(user, userInfo, result, systemUser.getAccount());
+		checkLogin(user, userInfo, result, Aes.decrypt(systemUser.getAccount()));
 		if (result.getCode() != CommonConstant.SC_INTERNAL_SERVER_ERROR_500) {
 			String token = jwtTokenProvider.createToken(userInfo.getAccount(), 3600 * 24 * 1000L);
 			userInfo.setToken(token);
@@ -207,7 +207,7 @@ public class SystemUserAuthController {
 				userInfo.setProjectDateAuth(government.getProjectDateAuth());
 			}
 			//登录名密码输入正确，清楚登陆失败记录
-			jwtTokenProvider.clearLock(user.getAccount());
+			jwtTokenProvider.clearLock(account);
 		}
 	}
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java
index c57da60..5248315 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java
@@ -126,11 +126,11 @@ public class EngineeringServiceImpl extends ServiceImpl<EngineeringMapper, Engin
         wrapper.set(Engineering::getExamineState, examineState);
         wrapper.set(Engineering::getExamineTime, new Date());
         wrapper.set(Engineering::getRejectReason, rejectReason);
-        String content = "工程报监审批已驳回; 工程名称:"+ engineering.getEngineeringName() + "; 驳回原因："  + rejectReason;
+        String content = "项目报监审批已驳回; 工程名称:"+ engineering.getEngineeringName() + "; 驳回原因："  + rejectReason;
         // 项目报监审核通过
         if (examineState == 3) {
             wrapper.set(Engineering::getState, 2);
-            content = "工程报监审批已通过; 工程名称:"+ engineering.getEngineeringName();
+            content = "项目报监审批已通过; 工程名称:"+ engineering.getEngineeringName();
         }
         wrapper.eq(Engineering::getId, id);
         boolean flag = this.update(wrapper);