Pārlūkot izejas kodu

Merge branch 'fix/splitValueList' into 'wrdp'

修正splitValueList的赋值错误

See merge request o2oa/o2oa!2475
o2null 5 gadi atpakaļ
vecāks
revīzija
549a1acad0

+ 1 - 1
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ApplicationServer.java

@@ -73,7 +73,7 @@ public class ApplicationServer extends ConfigObject {
 	@FieldDescribe("暴露jest接口.")
 	@FieldDescribe("暴露jest接口.")
 	private Boolean exposeJest;
 	private Boolean exposeJest;
 
 
-	@FieldDescribe("是否启用长连接,默认false.")
+	@FieldDescribe("是否启用长连接,默认true.")
 	private Boolean persistentConnectionsEnable;
 	private Boolean persistentConnectionsEnable;
 
 
 	public Boolean getPersistentConnectionsEnable() {
 	public Boolean getPersistentConnectionsEnable() {

+ 5 - 0
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Work.java

@@ -152,6 +152,11 @@ public class Work extends SliceJpaObject implements ProjectionInterface {
 	}
 	}
 
 
 	public List<String> getSplitValueList() {
 	public List<String> getSplitValueList() {
+		//这里调用必须重新指向一次,如果使用
+		//Work copy = XGsonBuilder.convert(work, Work.class);
+		//copy.copyTo(this, JpaObject.id_FIELDNAME);
+		//这样的方法调用,那么在运行完成以后copy.splitValueList不再指向this.getProperties().getSplitValueList()
+		this.splitValueList = this.getProperties().getSplitValueList();
 		return this.splitValueList;
 		return this.splitValueList;
 	}
 	}