Merge branch 'dev-mysql' into feature_release-tomysql

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

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

@@ -45,14 +45,12 @@ public class AuthenticationController {
 			return null;
 		}
 		User sysUser = SystemSession.getUser();
-		if (null != sysUser.getEnterprise()) {
-			if (sysUser.getEnterprise().getEnAdminuu().equals(sysUser.getUserUU())) {
-				sysUser.setIssys(Constant.YES);
-			}
-		}
 		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){