|
@@ -1,5 +1,6 @@
|
|
|
package com.uas.sso.controller;
|
|
package com.uas.sso.controller;
|
|
|
|
|
|
|
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
|
import org.springframework.data.domain.Page;
|
|
import org.springframework.data.domain.Page;
|
|
|
import com.uas.sso.core.Const;
|
|
import com.uas.sso.core.Const;
|
|
|
import com.uas.sso.entity.User;
|
|
import com.uas.sso.entity.User;
|
|
@@ -13,6 +14,7 @@ import com.uas.sso.service.UserspaceService;
|
|
|
import com.uas.sso.support.SystemSession;
|
|
import com.uas.sso.support.SystemSession;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.ui.ModelMap;
|
|
import org.springframework.ui.ModelMap;
|
|
|
|
|
+import org.springframework.util.CollectionUtils;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -50,7 +52,10 @@ public class YunCenterController extends BaseController {
|
|
|
|
|
|
|
|
// 设置返回数据
|
|
// 设置返回数据
|
|
|
ModelMap data = new ModelMap();
|
|
ModelMap data = new ModelMap();
|
|
|
- data.put("user", userAccount);
|
|
|
|
|
|
|
+ User user = userService.findOne(userAccount.getUserUU());
|
|
|
|
|
+ user.setSalt(null);
|
|
|
|
|
+ user.setPassword(null);
|
|
|
|
|
+ data.put("user", new ModelMap().addAllAttributes(JSONObject.parseObject(JSONObject.toJSONString(user))).addAttribute("hasQuestion", !CollectionUtils.isEmpty(user.getQuestions())));
|
|
|
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);
|
wangmh