Commit 4a00cc66 authored by jiawei's avatar jiawei

修改 用户登录数据库没有过期时间时 出现的空指针异常

parent 4c2e0b9a
package cn.chnmuseum.party.web.controller; package cn.chnmuseum.party.web.controller;
import cn.hutool.extra.qrcode.QrCodeUtil;
import cn.hutool.extra.qrcode.QrConfig;
import cn.chnmuseum.party.auth.SHA256PasswordEncryptionService; import cn.chnmuseum.party.auth.SHA256PasswordEncryptionService;
import cn.chnmuseum.party.auth.util.AESUtils; import cn.chnmuseum.party.auth.util.AESUtils;
import cn.chnmuseum.party.auth.util.JwtTokenUtil; import cn.chnmuseum.party.auth.util.JwtTokenUtil;
...@@ -14,6 +12,8 @@ import cn.chnmuseum.party.service.RoleService; ...@@ -14,6 +12,8 @@ import cn.chnmuseum.party.service.RoleService;
import cn.chnmuseum.party.service.impl.MenuServiceImpl; import cn.chnmuseum.party.service.impl.MenuServiceImpl;
import cn.chnmuseum.party.service.impl.TUserServiceImpl; import cn.chnmuseum.party.service.impl.TUserServiceImpl;
import cn.chnmuseum.party.web.controller.base.BaseController; import cn.chnmuseum.party.web.controller.base.BaseController;
import cn.hutool.extra.qrcode.QrCodeUtil;
import cn.hutool.extra.qrcode.QrConfig;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
...@@ -149,7 +149,7 @@ public class LoginController extends BaseController { ...@@ -149,7 +149,7 @@ public class LoginController extends BaseController {
} }
if (user.getPermanent() != null && !user.getPermanent()) { if (user.getPermanent() != null && !user.getPermanent()) {
if (user.getEffectiveDate().isAfter(LocalDate.now()) || user.getExiredDate().isBefore(LocalDate.now())) { if (user.getEffectiveDate() != null && user.getEffectiveDate().isAfter(LocalDate.now()) || user.getExiredDate() != null && user.getExiredDate().isBefore(LocalDate.now())) {
resultMap.put("resultCode", "4F00"); resultMap.put("resultCode", "4F00");
resultMap.put("message", "此帐号已失效,请联系管理员!"); resultMap.put("message", "此帐号已失效,请联系管理员!");
return resultMap; return resultMap;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment