Subversion Repositories SmartDukaan

Rev

Rev 24496 | Rev 25300 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 24496 Rev 24497
Line 141... Line 141...
141 
		Map<String, Object> responseMap = new HashMap<>();
 141 
		Map<String, Object> responseMap = new HashMap<>();
142 
		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
 142 
		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
143 
		User user = null;
 143 
		User user = null;
144 
		if (userInfo.getUserId() > -1) {
 144 
		if (userInfo.getUserId() > -1) {
145 
			user = userRepository.selectById(userInfo.getUserId());
 145 
			user = userRepository.selectById(userInfo.getUserId());
146 
			if(!(user.getEmailId()==null || user.getEmailId().equalsIgnoreCase(userInfo.getEmail()))) {
 146 
			if(!(userInfo.getEmail()==null || user.getEmailId().equalsIgnoreCase(userInfo.getEmail()))) {
147 
				String userName = null;
 147 
				String userName = null;
148 
				if(user.getSecondryEmailId()!=null && user.getSecondryEmailId().equals(userInfo.getEmail())) {
 148 
				if(user.getSecondryEmailId()!=null && user.getSecondryEmailId().equals(userInfo.getEmail())) {
149 
					userName = user.getFirstName() + " " + user.getLastName();
 149 
					userName = user.getFirstName() + " " + user.getLastName();
150 
				} else {
 150 
				} else {
151 
					userName = authService.getNameByEmailId(userInfo.getEmail());
 151 
					userName = authService.getNameByEmailId(userInfo.getEmail());