svnno****@sourc*****
svnno****@sourc*****
2009年 1月 31日 (土) 08:23:43 JST
Revision: 1709
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1709
Author: shinsuke
Date: 2009-01-31 08:23:43 +0900 (Sat, 31 Jan 2009)
Log Message:
-----------
removed disabled users.
Modified Paths:
--------------
scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/UserInfoService.java
-------------- next part --------------
Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/UserInfoService.java
===================================================================
--- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/UserInfoService.java 2009-01-30 22:21:12 UTC (rev 1708)
+++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/UserInfoService.java 2009-01-30 23:23:43 UTC (rev 1709)
@@ -118,6 +118,8 @@
}
cb.query().setUserId_NotInScope(excludedUserIdList);
}
+ cb.query().setDeletedBy_IsNull();
+ cb.query().setStatus_NotEqual(SchedulerConstants.USER_DISABLED);
return userInfoBhv.selectList(cb);
} else if (roleId != null) {
RoleMappingCB cb = new RoleMappingCB();
@@ -133,6 +135,9 @@
cb.query().setUserId_NotInScope(excludedUserIdList);
}
cb.query().setRoleId_Equal(roleId);
+ cb.query().queryUserInfo().setDeletedBy_IsNull();
+ cb.query().queryUserInfo().setStatus_NotEqual(
+ SchedulerConstants.USER_DISABLED);
List<RoleMapping> roleMappingList = roleMappingBhv.selectList(cb);
List<UserInfo> userInfoList = new ArrayList<UserInfo>();
@@ -154,6 +159,9 @@
cb.query().setUserId_NotInScope(excludedUserIdList);
}
cb.query().setGroupId_Equal(groupId);
+ cb.query().queryUserInfo().setDeletedBy_IsNull();
+ cb.query().queryUserInfo().setStatus_NotEqual(
+ SchedulerConstants.USER_DISABLED);
List<GroupMapping> groupMappingList = groupMappingBhv
.selectList(cb);