增加人员组织升降序排序配置

o2server/configSample/person.json

@@ -10,6 +10,7 @@
   "passwordRegexHint": "6位以上,包含数字和字母.",
   "register": "disable",
   "superPermission": true,
+  "personUnitOrderByAsc": true,
   "###captchaLogin": "是否启用验证码登录,默认值:true###",
   "###codeLogin": "是否启用验证码登录,默认值:true###",
   "###bindLogin": "是否启用扫描二维码登录,默认值:false###",
@@ -32,5 +33,6 @@
   },
   "###failureInterval": "登录限制时间(分钟)###",
   "###failureCount": "尝试登录次数###",
-  "###tokenExpiredMinutes": "token时长,分钟###"
+  "###tokenExpiredMinutes": "token时长,分钟###",
+  "###personUnitOrderByAsc": "人员组织排序是否为升序，true为升序(默认)，false为降序###"
 }

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Person.java

@@ -21,6 +21,7 @@ public class Person extends ConfigObject {
 	public static final Boolean DEFAULT_BINDLOGIN = true;
 	public static final Boolean DEFAULT_FACELOGIN = true;
 	public static final Boolean DEFAULT_SUPERPERMISSION = true;
+	public static final Boolean DEFAULT_PERSONUNITORDERBYASC = true;
 
 	public static final String REGISTER_TYPE_DISABLE = "disable";
 	public static final String REGISTER_TYPE_CAPTCHA = "captcha";
@@ -54,6 +55,7 @@ public class Person extends ConfigObject {
 		this.superPermission = DEFAULT_SUPERPERMISSION;
 		this.passwordRegex = DEFAULT_PASSWORDREGEX;
 		this.passwordRegexHint = DEFAULT_PASSWORDREGEXHINT;
+		this.personUnitOrderByAsc = DEFAULT_PERSONUNITORDERBYASC;
 	}
 
 	public static Person defaultInstance() {
@@ -107,6 +109,9 @@ public class Person extends ConfigObject {
 	@FieldDescribe("token时长,分钟")
 	private Integer tokenExpiredMinutes;
 
+	@FieldDescribe("人员组织排序是否为升序，true为升序(默认)，false为降序")
+	private Boolean personUnitOrderByAsc;
+
 	public Integer getTokenExpiredMinutes() {
 		return (this.tokenExpiredMinutes == null || this.tokenExpiredMinutes < 0) ? DEFAULT_TOKENEXPIREDMINUTES
 				: this.tokenExpiredMinutes;
@@ -296,4 +301,11 @@ public class Person extends ConfigObject {
 		this.tokenExpiredMinutes = tokenExpiredMinutes;
 	}
 
+	public Boolean getPersonUnitOrderByAsc() {
+		return BooleanUtils.isTrue(this.personUnitOrderByAsc) ? true : false;
+	}
+
+	public void setPersonUnitOrderByAsc(Boolean personUnitOrderByAsc) {
+		this.personUnitOrderByAsc = personUnitOrderByAsc;
+	}
 }

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

@@ -12,6 +12,7 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
+import com.x.base.core.project.config.Config;
 import org.apache.commons.lang3.StringUtils;
 
 import com.x.base.core.project.cache.ApplicationCache;
@@ -97,11 +98,18 @@ public class IdentityFactory extends AbstractFactory {
 		return list;
 	}
 
-	public <T extends Identity> List<T> sort(List<T> list) {
-		list = list.stream().sorted(
-				Comparator.comparing(Identity::getOrderNumber, Comparator.nullsLast(Integer::compareTo)).thenComparing(
-						Comparator.comparing(Identity::getName, Comparator.nullsFirst(String::compareTo)).reversed()))
-				.collect(Collectors.toList());
+	public <T extends Identity> List<T> sort(List<T> list) throws Exception {
+		if(Config.person().getPersonUnitOrderByAsc()) {
+			list = list.stream().sorted(
+					Comparator.comparing(Identity::getOrderNumber, Comparator.nullsLast(Integer::compareTo)).thenComparing(
+							Comparator.comparing(Identity::getName, Comparator.nullsFirst(String::compareTo)).reversed()))
+					.collect(Collectors.toList());
+		}else{
+			list = list.stream().sorted(
+					Comparator.comparing(Identity::getOrderNumber, Comparator.nullsLast(Integer::compareTo)).reversed().thenComparing(
+							Comparator.comparing(Identity::getName, Comparator.nullsFirst(String::compareTo)).reversed()))
+					.collect(Collectors.toList());
+		}
 		return list;
 	}
 

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

@@ -14,6 +14,7 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
+import com.x.base.core.project.config.Config;
 import org.apache.commons.lang3.StringUtils;
 
 import com.x.base.core.project.cache.ApplicationCache;
@@ -117,13 +118,23 @@ public class UnitFactory extends AbstractFactory {
 		return list;
 	}
 
-	public <T extends Unit> List<T> sort(List<T> list) {
-		List<T> os = list.stream().sorted(Comparator.comparing(Unit::getLevel, Comparator.nullsLast(Integer::compareTo))
-				.thenComparing(Comparator.comparing(Unit::getOrderNumber, Comparator.nullsLast(Integer::compareTo)))
-				.thenComparing(
-						Comparator.comparing(Unit::getName, Comparator.nullsFirst(String::compareTo)).reversed()))
-				.collect(Collectors.toList());
-		return os;
+	public <T extends Unit> List<T> sort(List<T> list) throws Exception {
+		if(Config.person().getPersonUnitOrderByAsc()) {
+			List<T> os = list.stream().sorted(Comparator.comparing(Unit::getLevel, Comparator.nullsLast(Integer::compareTo))
+					.thenComparing(Comparator.comparing(Unit::getOrderNumber, Comparator.nullsLast(Integer::compareTo)))
+					.thenComparing(
+							Comparator.comparing(Unit::getName, Comparator.nullsFirst(String::compareTo)).reversed()))
+					.collect(Collectors.toList());
+			return os;
+		}else{
+			List<T> os = list.stream().sorted(Comparator.comparing(Unit::getLevel, Comparator.nullsLast(Integer::compareTo))
+					.thenComparing(Comparator.comparing(Unit::getOrderNumber, Comparator.nullsLast(Integer::compareTo)).reversed())
+					.thenComparing(
+							Comparator.comparing(Unit::getName, Comparator.nullsFirst(String::compareTo)).reversed()))
+					.collect(Collectors.toList());
+			return os;
+		}
+
 	}
 
 	public String getSupDirect(String id) throws Exception {

o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/factory/IdentityFactory.java

@@ -15,6 +15,7 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
+import com.x.base.core.project.config.Config;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -115,11 +116,18 @@ public class IdentityFactory extends AbstractFactory {
 		return is;
 	}
 
-	public <T extends Identity> List<T> sort(List<T> list) {
-		list = list.stream().sorted(
-				Comparator.comparing(Identity::getOrderNumber, Comparator.nullsLast(Integer::compareTo)).thenComparing(
-						Comparator.comparing(Identity::getName, Comparator.nullsFirst(String::compareTo)).reversed()))
-				.collect(Collectors.toList());
+	public <T extends Identity> List<T> sort(List<T> list) throws Exception {
+		if(Config.person().getPersonUnitOrderByAsc()) {
+			list = list.stream().sorted(
+					Comparator.comparing(Identity::getOrderNumber, Comparator.nullsLast(Integer::compareTo)).thenComparing(
+							Comparator.comparing(Identity::getName, Comparator.nullsFirst(String::compareTo)).reversed()))
+					.collect(Collectors.toList());
+		}else{
+			list = list.stream().sorted(
+					Comparator.comparing(Identity::getOrderNumber, Comparator.nullsLast(Integer::compareTo)).reversed()
+					.thenComparing(Comparator.comparing(Identity::getName, Comparator.nullsFirst(String::compareTo)).reversed()))
+					.collect(Collectors.toList());
+		}
 		return list;
 	}
 

o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/factory/UnitFactory.java

@@ -14,6 +14,7 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
+import com.x.base.core.project.config.Config;
 import org.apache.commons.lang3.StringUtils;
 
 import com.x.base.core.entity.JpaObject;
@@ -121,12 +122,18 @@ public class UnitFactory extends AbstractFactory {
 		return list;
 	}
 
-	public <T extends Unit> List<T> sort(List<T> list) {
-		list = list.stream().sorted(Comparator.comparing(Unit::getLevel, Comparator.nullsLast(Integer::compareTo))
-				.thenComparing(Comparator.comparing(Unit::getOrderNumber, Comparator.nullsLast(Integer::compareTo)))
-				.thenComparing(
-						Comparator.comparing(Unit::getName, Comparator.nullsFirst(String::compareTo)).reversed()))
-				.collect(Collectors.toList());
+	public <T extends Unit> List<T> sort(List<T> list) throws Exception {
+		if(Config.person().getPersonUnitOrderByAsc()) {
+			list = list.stream().sorted(Comparator.comparing(Unit::getLevel, Comparator.nullsLast(Integer::compareTo))
+					.thenComparing(Comparator.comparing(Unit::getOrderNumber, Comparator.nullsLast(Integer::compareTo)))
+					.thenComparing(Comparator.comparing(Unit::getName, Comparator.nullsFirst(String::compareTo)).reversed()))
+					.collect(Collectors.toList());
+		}else{
+			list = list.stream().sorted(Comparator.comparing(Unit::getLevel, Comparator.nullsLast(Integer::compareTo))
+					.thenComparing(Comparator.comparing(Unit::getOrderNumber, Comparator.nullsLast(Integer::compareTo)).reversed())
+					.thenComparing(Comparator.comparing(Unit::getName, Comparator.nullsFirst(String::compareTo)).reversed()))
+					.collect(Collectors.toList());
+		}
 		return list;
 	}