按企业顺序排序优化

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

@@ -44,19 +44,6 @@ public class AuthenticationController {
 		List<UserQuestion> userQuestion = userQuestionService.findUserQuestionByUserUUOrderBySortAsc(sysUser.getUserUU());
 		User user = userService.findUserByUserUU(sysUser.getUserUU());
 		user.setEnterprise(sysUser.getEnterprise());
-		//保存登录时间
-		List<UserLoginTime> userLoginTimeList = userLoginTimeDao.findByUserUUAndEnUU(user.getUserUU(),user.getEnterprise().getUu());
-		UserLoginTime userLoginTime;
-		if (!CollectionUtils.isEmpty(userLoginTimeList)){
-			userLoginTime = userLoginTimeList.get(0);
-		}else {
-			userLoginTime = new UserLoginTime();
-			userLoginTime.setUserUU(user.getUserUU());
-			userLoginTime.setEnUU(user.getEnterprise().getUu());
-		}
-		userLoginTime.setLoginTime(System.currentTimeMillis());
-		userLoginTimeDao.save(userLoginTime);
-		user = userService.findUserByUserUU(user.getUserUU());
 		UserInfo userInfo = new UserInfo(user);
 		if(userQuestion!=null){
 			if(userQuestion.size()>0){
@@ -94,6 +81,21 @@ public class AuthenticationController {
 	@ResponseBody
 	public void switchEnterprise(@PathVariable("enUU") long enUU) {
 		User user = SystemSession.getUser();
+		//保存登录时间
+		List<UserLoginTime> userLoginTimeList = userLoginTimeDao.findByUserUUAndEnUU(user.getUserUU(),user.getEnterprise().getUu());
+		UserLoginTime userLoginTime;
+		if (!CollectionUtils.isEmpty(userLoginTimeList)){
+			userLoginTime = userLoginTimeList.get(0);
+		}else {
+			userLoginTime = new UserLoginTime();
+			userLoginTime.setUserUU(user.getUserUU());
+			userLoginTime.setEnUU(user.getEnterprise().getUu());
+		}
+		userLoginTime.setLoginTime(System.currentTimeMillis());
+		try {
+			userLoginTimeDao.save(userLoginTime);
+		}catch (Exception e){}
+
 		if ( enUU == 0L){
 			user.setEnterprise(null);
 		}else {

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

@@ -299,7 +299,9 @@ public class SecurityController {
 								userLoginTime.setEnUU(enterprise.getUu());
 							}
 							userLoginTime.setLoginTime(System.currentTimeMillis());
-							userLoginTimeDao.save(userLoginTime);
+							try {
+								userLoginTimeDao.save(userLoginTime);
+							}catch (Exception e){}
 							break;
 						}
 					}

src/main/java/com/uas/platform/b2c/common/account/model/UserInfo.java

@@ -21,7 +21,6 @@ public class UserInfo {
 		this.userName = user.getUserName();
 		this.userTel = user.getUserTel();
 		this.userSex = user.getUserSex();
-		this.userLoginTimeSet = user.getUserLoginTimeSet();
 		this.pwdEnable = user.getPwdSecLevel()!=null && user.getPwdSecLevel()>1?true:false;
 		this.sys = user.isSys();
 		if (user.getRoles() != null && user.getRoles().size() > 0) {
@@ -47,8 +46,14 @@ public class UserInfo {
 				if (enterprise.equals(current)){
 					map.put("current", true);
 				}
+				for (UserLoginTime userLoginTime : user.getUserLoginTimeSet()){
+					if (userLoginTime.getEnUU().equals(enterprise.getUu())){
+						map.put("lastLoginTime" , userLoginTime.getLoginTime());
+					}
+				}
 				list.add(map);
 			}
+
 			this.enterprises = list;
 		}
 		this.havePayPwd = user.getUserPay()==null || user.getUserPay().equals("") ?false:true;