|
|
@@ -34,8 +34,10 @@ public class AuthenticationController {
|
|
|
if (SystemSession.getUser() == null) {
|
|
|
return null;
|
|
|
}
|
|
|
- List<UserQuestion> userQuestion = userQuestionService.findUserQuestionByUserUUOrderBySortAsc(SystemSession.getUser().getUserUU());
|
|
|
- User user = userService.findUserByUserUU(SystemSession.getUser().getUserUU());
|
|
|
+ User sysUser = SystemSession.getUser();
|
|
|
+ List<UserQuestion> userQuestion = userQuestionService.findUserQuestionByUserUUOrderBySortAsc(sysUser.getUserUU());
|
|
|
+ User user = userService.findUserByUserUU(sysUser.getUserUU());
|
|
|
+ user.setEnterprise(sysUser.getEnterprise());
|
|
|
UserInfo userInfo = new UserInfo(user);
|
|
|
if(userQuestion!=null){
|
|
|
if(userQuestion.size()>0){
|