Merge branch '修复三员管理安全管理员不能查看所有用户的问题' into 'develop'

修复三员管理安全管理员不能查看所有用户的问题

See merge request o2oa/o2oa!34

o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/Business.java

@@ -536,7 +536,7 @@ public class Business {
 	public Predicate personPredicateWithTopUnit(EffectivePerson effectivePerson) throws Exception {
 		EntityManager em = emc.get(Person.class);
 		CriteriaBuilder cb = em.getCriteriaBuilder();
-		if (effectivePerson.isManager() || this.hasAnyRole(effectivePerson, OrganizationDefinition.Manager,
+		if (effectivePerson.isSecurityManager() || this.hasAnyRole(effectivePerson, OrganizationDefinition.Manager,
 				OrganizationDefinition.OrganizationManager)) {
 			return cb.conjunction();
 		} else {

o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListNext.java

@@ -45,7 +45,7 @@ class ActionListNext extends BaseAction {
 					id = o.getId();
 				}
 
-				if (effectivePerson.isManager() || business.hasAnyRole(effectivePerson, OrganizationDefinition.Manager,
+				if (effectivePerson.isSecurityManager() || business.hasAnyRole(effectivePerson, OrganizationDefinition.Manager,
 						OrganizationDefinition.OrganizationManager)) {
 					result = this.standardListNext(Wo.copier, id, count, JpaObject.sequence_FIELDNAME, DESC,
 							business.personPredicateWithTopUnit(effectivePerson));

o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListPrev.java

@@ -44,7 +44,7 @@ class ActionListPrev extends BaseAction {
 					}
 					id = o.getId();
 				}
-				if (effectivePerson.isManager() || business.hasAnyRole(effectivePerson, OrganizationDefinition.Manager,
+				if (effectivePerson.isSecurityManager() || business.hasAnyRole(effectivePerson, OrganizationDefinition.Manager,
 						OrganizationDefinition.OrganizationManager)) {
 					result = this.standardListPrev(Wo.copier, id, count, JpaObject.sequence_FIELDNAME, DESC,
 							business.personPredicateWithTopUnit(effectivePerson));