userInfo包装类修改

src/main/java/com/uas/platform/b2c/common/account/controller/AuthenticationController.java

@@ -47,7 +47,7 @@ public class AuthenticationController {
 			return null;
 		}
 		User sysUser = SystemSession.getUser();
-		List<UserQuestion> userQuestion = userQuestionService.findUserQuestionByUserUUOrderBySortAsc(sysUser.getUserUU());
+		//List<UserQuestion> userQuestion = userQuestionService.findUserQuestionByUserUUOrderBySortAsc(sysUser.getUserUU());
 		User user = userService.findUserByUserUU(sysUser.getUserUU());
 		user.setEnterprise(sysUser.getEnterprise());
 		try{
@@ -55,17 +55,11 @@ public class AuthenticationController {
 				user.setIssys(Constant.YES);
 			}
 		} catch (NullPointerException e) { }
-
 		UserInfo userInfo = new UserInfo(user);
-		if (!CollectionUtils.isEmpty(userQuestion)) {
+		Integer hasQuestion = user.getHasQuestion();
+		if (hasQuestion != null && hasQuestion ==1) {
 			userInfo.setHaveUserQuestion(true);
 			userInfo.setSecLevel((short) (1 + userInfo.getSecLevel()));
-		} else {
-			Integer hasQuestion = user.getHasQuestion();
-			if (hasQuestion != null && hasQuestion ==1) {
-				userInfo.setHaveUserQuestion(true);
-				userInfo.setSecLevel((short) (1 + userInfo.getSecLevel()));
-			}
 		}
 		return userInfo;
 	}