|
@@ -55,7 +55,7 @@ public class YunCenterController extends BaseController {
|
|
|
user.setPassword(null);
|
|
user.setPassword(null);
|
|
|
data.put("user", new ModelMap().addAllAttributes(JSONObject.parseObject(JSONObject.toJSONString(user)))
|
|
data.put("user", new ModelMap().addAllAttributes(JSONObject.parseObject(JSONObject.toJSONString(user)))
|
|
|
.addAttribute("hasQuestion", !CollectionUtils.isEmpty(user.getQuestions()))
|
|
.addAttribute("hasQuestion", !CollectionUtils.isEmpty(user.getQuestions()))
|
|
|
- .addAttribute("lastLoginTime", user.getUserRecord().getLastLoginTime()));
|
|
|
|
|
|
|
+ .addAttribute("lastLoginTime", user.getUserRecord() == null ? null : user.getUserRecord().getLastLoginTime()));
|
|
|
if (userAccount.getSpaceUU() != null) {
|
|
if (userAccount.getSpaceUU() != null) {
|
|
|
Userspace userspace = userspaceService.findOne(userAccount.getSpaceUU());
|
|
Userspace userspace = userspaceService.findOne(userAccount.getSpaceUU());
|
|
|
data.put("userspace", userspace);
|
|
data.put("userspace", userspace);
|