dcs 7 miesięcy temu
rodzic
commit
3a20179c0d

+ 6 - 2
virgo.core/src/main/java/com/bosshand/virgo/core/service/MgrUserService.java

@@ -276,15 +276,16 @@ public class MgrUserService {
 						}
 					}
 				}
-
 				List<MgrOrganizationProject> list = mgrOrganizationProjectDao.get(mgrUserRole.getOrganizationId(), userId);
 				if (list != null & list.size() > 0) {
 					for (MgrOrganizationProject mop : list) {
 						projectIds.add(mop.getProjectId());
 					}
 				}
+			}
 
-				if (projectIds.size() > 0) {
+			if (projectIds.size() > 0) {
+				for (MgrUserRole mgrUserRole : userRoles) {
 					for (Long projectId : projectIds) {
 						Set<JSONObject> identityList = new HashSet<>();
 						if (isAdmin(user, mgrUserRole.getOrganizationId())) {
@@ -295,7 +296,10 @@ public class MgrUserService {
 						map.put(projectId, identityList);
 					}
 				}
+			}
 
+			for (MgrUserRole mgrUserRole : userRoles) {
+				List<MgrOrganizationProject> list = mgrOrganizationProjectDao.get(mgrUserRole.getOrganizationId(), userId);
 				if (list != null & list.size() > 0) {
 					for (MgrOrganizationProject mop : list) {
 						map.forEach((key, value) -> {

+ 1 - 1
virgo.core/src/main/java/com/bosshand/virgo/core/utils/CodeCache.java

@@ -10,7 +10,7 @@ import java.util.concurrent.TimeUnit;
 
 public class CodeCache {
 
-    public static final String DefaultPhone = "18888888888,17777777777,17698569102,17698963228,16666666666,17711111111,17711111112,17711112222";
+    public static final String DefaultPhone = "18888888888,17777777777,17698569102,17698963228,16666666666,17711111111,17711111112,17711112222,17601274604,17601274603,13298303283";
 
     public static final String DefaultPhoneCode = "888888";