Merge branch 'release' into 'develop'

Release

See merge request o2oa/o2oa!1719

o2server/x_program_center/src/main/java/com/x/program/center/dingding/SyncOrganization.java

@@ -443,6 +443,7 @@ public class SyncOrganization {
 		if (order != null) {
 			identity.setOrderNumber(order.intValue());
 		}
+		identity.setMajor(true);
 		emc.persist(identity, CheckPersistType.all);
 		emc.commit();
 		result.getCreateIdentityList().add(identity.getDistinguishedName());

o2server/x_program_center/src/main/java/com/x/program/center/qiyeweixin/SyncOrganization.java

@@ -432,6 +432,7 @@ public class SyncOrganization {
 		if (order != null) {
 			identity.setOrderNumber(order.intValue());
 		}
+		identity.setMajor(true);
 		emc.persist(identity, CheckPersistType.all);
 		emc.commit();
 		result.getCreateIdentityList().add(identity.getDistinguishedName());

o2server/x_program_center/src/main/java/com/x/program/center/welink/SyncOrganization.java

@@ -207,6 +207,7 @@ public class SyncOrganization {
         if (order != null) {
             identity.setOrderNumber(order.intValue());
         }
+        identity.setMajor(true);
         emc.persist(identity, CheckPersistType.all);
         emc.commit();
         result.getCreateIdentityList().add(identity.getDistinguishedName());

o2server/x_program_center/src/main/java/com/x/program/center/zhengwudingding/SyncOrganization.java

@@ -421,6 +421,7 @@ public class SyncOrganization {
 				identity.setOrderNumber(-order.intValue());
 			}
 		}
+		identity.setMajor(true);
 		emc.persist(identity, CheckPersistType.all);
 		emc.commit();
 		result.getCreateIdentityList().add(identity.getDistinguishedName());