github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

!231 修复封装类转基础数据空指针异常 

Merge pull request !231 from RamaYuYang/master
pull/231/MERGE
若依 2020-11-25 18:26:20 +08:00 committed by Gitee
parent e6500ee26a bc96bbc9ac
commit 9aa405c203
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
View File

@ -98,15 +98,15 @@ public class SysIndexController extends BaseController
// 检查初始密码是否提醒修改 // 检查初始密码是否提醒修改
public boolean initPasswordIsModify(Date pwdUpdateDate) public boolean initPasswordIsModify(Date pwdUpdateDate)
{ {
int initPasswordModify = Convert.toInt(configService.selectConfigByKey("sys.account.initPasswordModify")); Integer initPasswordModify = Convert.toInt(configService.selectConfigByKey("sys.account.initPasswordModify"));
return initPasswordModify == 1 && pwdUpdateDate == null; return initPasswordModify !=null && initPasswordModify == 1 && pwdUpdateDate == null;
} }
// 检查密码是否过期 // 检查密码是否过期
public boolean passwordIsExpiration(Date pwdUpdateDate) public boolean passwordIsExpiration(Date pwdUpdateDate)
{ {
int passwordValidateDays = Convert.toInt(configService.selectConfigByKey("sys.account.passwordValidateDays")); Integer passwordValidateDays = Convert.toInt(configService.selectConfigByKey("sys.account.passwordValidateDays"));
if (passwordValidateDays > 0) if (passwordValidateDays !=null && passwordValidateDays > 0)
{ {
if (StringUtils.isNull(pwdUpdateDate)) if (StringUtils.isNull(pwdUpdateDate))
{ {