登录问题

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

@@ -10,6 +10,8 @@ import com.uas.platform.b2c.common.account.model.UserQuestion;
 import com.uas.platform.b2c.common.account.service.UserQuestionService;
 import com.uas.platform.b2c.common.account.service.UserService;
 import com.uas.platform.b2c.core.support.SystemSession;
+
+import java.util.Collection;
 import java.util.List;
 
 import com.uas.platform.core.model.Constant;
@@ -48,15 +50,16 @@ public class AuthenticationController {
 		List<UserQuestion> userQuestion = userQuestionService.findUserQuestionByUserUUOrderBySortAsc(sysUser.getUserUU());
 		User user = userService.findUserByUserUU(sysUser.getUserUU());
 		user.setEnterprise(sysUser.getEnterprise());
-		if (user.getEnterprise().getEnAdminuu().equals(user.getUserUU())) {
-			user.setIssys(Constant.YES);
-		}
-		UserInfo userInfo = new UserInfo(user);
-		if(userQuestion!=null){
-			if(userQuestion.size()>0){
-				userInfo.setHaveUserQuestion(true);
-				userInfo.setSecLevel((short)(1+userInfo.getSecLevel()));
+		try{
+			if (user.getEnterprise().getEnAdminuu().equals(user.getUserUU())) {
+				user.setIssys(Constant.YES);
 			}
+		} catch (NullPointerException e) { }
+
+		UserInfo userInfo = new UserInfo(user);
+		if (!CollectionUtils.isEmpty(userQuestion)) {
+			userInfo.setHaveUserQuestion(true);
+			userInfo.setSecLevel((short)(1+userInfo.getSecLevel()));
 		}
 		return userInfo;
 	}