Merge branch 'fix/根据层级查询组织返回数据未排序' into 'wrdp'

[人员组织]修复查询组织对象未排序问题

See merge request o2oa/o2oa!2295

o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/unit/ActionListWithIdentityObject.java

@@ -79,7 +79,9 @@ class ActionListWithIdentityObject extends BaseAction {
 		List<String> unitIds = em.createQuery(cq.select(root.get(Identity_.unit)).where(p))
 				.getResultList().stream().distinct().collect(Collectors.toList());
 		unitIds = ListTools.trim(unitIds, true, true);
-		for (Unit o : business.unit().pick(unitIds)) {
+		List<Unit> units = business.unit().pick(unitIds);
+		units = business.unit().sort(units);
+		for (Unit o : units) {
 			wos.add(this.convert(business, o, Wo.class));
 		}
 		return wos;

o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/unit/ActionListWithIdentitySupNestedObject.java

@@ -83,7 +83,9 @@ class ActionListWithIdentitySupNestedObject extends BaseAction {
 			unitIds.addAll(business.unit().listSupNested(str));
 		}
 		unitIds = ListTools.trim(unitIds, true, true);
-		for (Unit o : business.unit().pick(unitIds)) {
+		List<Unit> units = business.unit().pick(unitIds);
+		units = business.unit().sort(units);
+		for (Unit o : units) {
 			wos.add(this.convert(business, o, Wo.class));
 		}
 		return wos;

o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/unit/ActionListWithLevelObject.java

@@ -72,10 +72,10 @@ class ActionListWithLevelObject extends BaseAction {
 		CriteriaQuery<String> cq = cb.createQuery(String.class);
 		Root<Unit> root = cq.from(Unit.class);
 		Predicate p = root.get(Unit_.level).in(wi.getLevelList());
-		List<String> unitIds = em.createQuery(cq.select(root.get(Unit_.id)).where(p))
-				.getResultList().stream().distinct().collect(Collectors.toList());
-		unitIds = ListTools.trim(unitIds, true, true);
-		for (Unit o : business.unit().pick(unitIds)) {
+		List<String> unitIds = em.createQuery(cq.select(root.get(Unit_.id)).where(p)).getResultList();
+		List<Unit> units = business.unit().pick(unitIds);
+		units = business.unit().sort(units);
+		for (Unit o : units) {
 			wos.add(this.convert(business, o, Wo.class));
 		}
 		return wos;

o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/unit/ActionListWithPersonObject.java

@@ -80,8 +80,9 @@ class ActionListWithPersonObject extends BaseAction {
 			Predicate p = root.get(Identity_.person).in(ids);
 			List<String> unitIds = em.createQuery(cq.select(root.get(Identity_.unit)).where(p))
 					.getResultList().stream().distinct().collect(Collectors.toList());
-			unitIds = ListTools.trim(unitIds, true, true);
-			for (Unit o : business.unit().pick(unitIds)) {
+			List<Unit> units = business.unit().pick(unitIds);
+			units = business.unit().sort(units);
+			for (Unit o : units) {
 				wos.add(this.convert(business, o, Wo.class));
 			}
 		}

o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/unit/ActionListWithPersonSupNestedObject.java

@@ -83,7 +83,9 @@ class ActionListWithPersonSupNestedObject extends BaseAction {
 			unitIds.addAll(business.unit().listSupNested(str));
 		}
 		unitIds = ListTools.trim(unitIds, true, true);
-		for (Unit o : business.unit().pick(unitIds)) {
+		List<Unit> units = business.unit().pick(unitIds);
+		units = business.unit().sort(units);
+		for (Unit o : units) {
 			wos.add(this.convert(business, o, Wo.class));
 		}
 		return wos;

o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/unit/ActionListWithUnitAttributeObject.java

@@ -88,7 +88,9 @@ class ActionListWithUnitAttributeObject extends BaseAction {
 		List<String> unitIds = em.createQuery(cq.select(root.get(UnitAttribute_.unit)).where(p))
 				.getResultList().stream().distinct().collect(Collectors.toList());
 		unitIds = ListTools.trim(unitIds, true, true);
-		for (Unit o : business.unit().pick(unitIds)) {
+		List<Unit> units = business.unit().pick(unitIds);
+		units = business.unit().sort(units);
+		for (Unit o : units) {
 			wos.add(this.convert(business, o, Wo.class));
 		}
 		return wos;

o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/unit/ActionListWithUnitDutyObject.java

@@ -91,7 +91,9 @@ class ActionListWithUnitDutyObject extends BaseAction {
 			List<String> unitIds = em.createQuery(cq.select(root.get(UnitDuty_.unit)).where(p))
 					.getResultList().stream().distinct().collect(Collectors.toList());
 			unitIds = ListTools.trim(unitIds, true, true);
-			for (Unit o : business.unit().pick(unitIds)) {
+			List<Unit> units = business.unit().pick(unitIds);
+			units = business.unit().sort(units);
+			for (Unit o : units) {
 				wos.add(this.convert(business, o, Wo.class));
 			}
 		}