dcs 6 mesi fa
parent
commit
31d03c9ab7

+ 10 - 1
virgo.core/src/main/java/com/bosshand/virgo/core/service/MgrUserService.java

@@ -327,6 +327,15 @@ public class MgrUserService {
 		return mgrResourceDao.defaultResource();
 	}
 
+	private Boolean contains(List<MgrOrganization> organizationList, MgrOrganization currentOrganization) {
+		for (MgrOrganization mgrOrganization : organizationList) {
+			if (mgrOrganization.getId() == currentOrganization.getId()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	//store user context into session. This is not good place to put those code.
 	public void loadContext(Subject subject) {
     	if(subject == null) {
@@ -344,7 +353,7 @@ public class MgrUserService {
     	if(user.getLastOrganizationId() != -1) {
     		currentOrganization = getLastOrganization(user);
     		//check in the organization list
-    		if(!organizationList.contains(currentOrganization)) {
+    		if(!this.contains(organizationList,currentOrganization)) {
     			currentOrganization = null;
     		}
     	}