admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
pengjie 2023-10-31 19:06:43 +08:00
parent b5a9fc4ff4
commit f58b5d5c57
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java
View File

@ -86,7 +86,7 @@ public class SystemUserAuthController {
.eq(SystemUser::getAccount, Aes.decrypt(systemUser.getAccount())) .eq(SystemUser::getAccount, Aes.decrypt(systemUser.getAccount()))
.eq(SystemUser::getShowPassword, Aes.decrypt(systemUser.getShowPassword()))); .eq(SystemUser::getShowPassword, Aes.decrypt(systemUser.getShowPassword())));
SystemUserAuthDto userInfo = new SystemUserAuthDto(); 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) { if (result.getCode() != CommonConstant.SC_INTERNAL_SERVER_ERROR_500) {
String token = jwtTokenProvider.createToken(userInfo.getAccount(), 3600 * 24 * 1000L); String token = jwtTokenProvider.createToken(userInfo.getAccount(), 3600 * 24 * 1000L);
userInfo.setToken(token); userInfo.setToken(token);
@ -207,7 +207,7 @@ public class SystemUserAuthController {
userInfo.setProjectDateAuth(government.getProjectDateAuth()); userInfo.setProjectDateAuth(government.getProjectDateAuth());
} }
//登录名密码输入正确，清楚登陆失败记录 //登录名密码输入正确，清楚登陆失败记录
jwtTokenProvider.clearLock(user.getAccount()); jwtTokenProvider.clearLock(account);
} }
} }

4
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java
View File

@ -126,11 +126,11 @@ public class EngineeringServiceImpl extends ServiceImpl<EngineeringMapper, Engin
wrapper.set(Engineering::getExamineState, examineState); wrapper.set(Engineering::getExamineState, examineState);
wrapper.set(Engineering::getExamineTime, new Date()); wrapper.set(Engineering::getExamineTime, new Date());
wrapper.set(Engineering::getRejectReason, rejectReason); wrapper.set(Engineering::getRejectReason, rejectReason);
String content = "工程报监审批已驳回; 工程名称:"+ engineering.getEngineeringName() + "; 驳回原因：" + rejectReason; String content = "项目报监审批已驳回; 工程名称:"+ engineering.getEngineeringName() + "; 驳回原因：" + rejectReason;
// 项目报监审核通过 // 项目报监审核通过
if (examineState == 3) { if (examineState == 3) {
wrapper.set(Engineering::getState, 2); wrapper.set(Engineering::getState, 2);
content = "工程报监审批已通过; 工程名称:"+ engineering.getEngineeringName(); content = "项目报监审批已通过; 工程名称:"+ engineering.getEngineeringName();
} }
wrapper.eq(Engineering::getId, id); wrapper.eq(Engineering::getId, id);
boolean flag = this.update(wrapper); boolean flag = this.update(wrapper);