Merge branch 'fix/CMS.review.xbundle' into 'release'

[内容管理]修复了在某些情况下排序索引列过长，无法正确处理权限的问题

See merge request o2oa/o2oa!967

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/Document.java

@@ -807,7 +807,7 @@ public class Document extends SliceJpaObject {
 	}
 
 	public void setSequenceTitle(String sequenceTitle) {
-		this.sequenceTitle = sequenceTitle;
+		this.sequenceTitle = getSequenceString(sequenceTitle);
 	}
 
 	public String getSequenceAppAlias() {
@@ -815,7 +815,7 @@ public class Document extends SliceJpaObject {
 	}
 
 	public void setSequenceAppAlias(String sequenceAppAlias) {
-		this.sequenceAppAlias = sequenceAppAlias;
+		this.sequenceAppAlias = getSequenceString(sequenceAppAlias);
 	}
 
 	public String getSequenceCategoryAlias() {
@@ -823,7 +823,7 @@ public class Document extends SliceJpaObject {
 	}
 
 	public void setSequenceCategoryAlias(String sequenceCategoryAlias) {
-		this.sequenceCategoryAlias = sequenceCategoryAlias;
+		this.sequenceCategoryAlias = getSequenceString(sequenceCategoryAlias);
 	}
 
 	public String getSequenceCreatorPerson() {
@@ -831,7 +831,7 @@ public class Document extends SliceJpaObject {
 	}
 
 	public void setSequenceCreatorPerson(String sequenceCreatorPerson) {
-		this.sequenceCreatorPerson = sequenceCreatorPerson;
+		this.sequenceCreatorPerson = getSequenceString(sequenceCreatorPerson);
 	}
 
 	public String getSequenceCreatorUnitName() {
@@ -839,7 +839,7 @@ public class Document extends SliceJpaObject {
 	}
 
 	public void setSequenceCreatorUnitName(String sequenceCreatorUnitName) {
-		this.sequenceCreatorUnitName = sequenceCreatorUnitName;
+		this.sequenceCreatorUnitName = getSequenceString(sequenceCreatorUnitName);
 	}
 
 	// -------------------Reader-------------------------
@@ -1050,4 +1050,11 @@ public class Document extends SliceJpaObject {
 		}
 		return sequence_FIELDNAME;
 	}
+
+	private String getSequenceString(String sequenceString ) {
+		if( StringUtils.length(sequenceString) > 60 ){
+			return StringUtils.substring(sequenceString, 0, 60 );
+		}
+		return sequenceString;
+	}
 }
\ No newline at end of file

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/Review.java

@@ -483,7 +483,7 @@ public class Review extends SliceJpaObject {
 	}
 
 	public void setDocSequence(String docSequence) {
-		this.docSequence = docSequence;
+		this.docSequence = getSequenceString(docSequence);
 	}
 
 	public String getSequenceTitle() {
@@ -491,7 +491,7 @@ public class Review extends SliceJpaObject {
 	}
 
 	public void setSequenceTitle(String sequenceTitle) {
-		this.sequenceTitle = sequenceTitle;
+		this.sequenceTitle = getSequenceString(sequenceTitle);
 	}
 
 	public String getSequenceAppAlias() {
@@ -499,7 +499,7 @@ public class Review extends SliceJpaObject {
 	}
 
 	public void setSequenceAppAlias(String sequenceAppAlias) {
-		this.sequenceAppAlias = sequenceAppAlias;
+		this.sequenceAppAlias = getSequenceString(sequenceAppAlias);
 	}
 
 	public String getSequenceCategoryAlias() {
@@ -507,7 +507,7 @@ public class Review extends SliceJpaObject {
 	}
 
 	public void setSequenceCategoryAlias(String sequenceCategoryAlias) {
-		this.sequenceCategoryAlias = sequenceCategoryAlias;
+		this.sequenceCategoryAlias = getSequenceString(sequenceCategoryAlias);
 	}
 
 	public String getSequenceCreatorPerson() {
@@ -515,7 +515,7 @@ public class Review extends SliceJpaObject {
 	}
 
 	public void setSequenceCreatorPerson(String sequenceCreatorPerson) {
-		this.sequenceCreatorPerson = sequenceCreatorPerson;
+		this.sequenceCreatorPerson = getSequenceString(sequenceCreatorPerson);
 	}
 
 	public String getSequenceCreatorUnitName() {
@@ -523,7 +523,7 @@ public class Review extends SliceJpaObject {
 	}
 
 	public void setSequenceCreatorUnitName(String sequenceCreatorUnitName) {
-		this.sequenceCreatorUnitName = sequenceCreatorUnitName;
+		this.sequenceCreatorUnitName = getSequenceString(sequenceCreatorUnitName);
 	}
 
 	public static final String[] sortableFieldNames = { appAlias_FIELDNAME, appId_FIELDNAME, appName_FIELDNAME,
@@ -597,4 +597,11 @@ public class Review extends SliceJpaObject {
 		}
 		return sequence_FIELDNAME;
 	}
+
+	private String getSequenceString(String sequenceString ) {
+		if( StringUtils.length(sequenceString) > 60 ){
+			return StringUtils.substring(sequenceString, 0, 60 );
+		}
+		return sequenceString;
+	}
 }
\ No newline at end of file