diff --git a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/Business.java b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/Business.java index fb2c892538122d5c66645aa3705a62e013efd948..dddd7ebb6663b4da2a155f73ed2ed7ede673d5a4 100644 --- a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/Business.java +++ b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/Business.java @@ -53,8 +53,8 @@ public class Business { public Business(EntityManagerContainer emc) throws Exception { this.emc = emc; - this.cacheCategory = new CacheCategory(Group.class, Role.class, Person.class, PersonAttribute.class, - Unit.class, UnitDuty.class, UnitAttribute.class, Identity.class); + this.cacheCategory = new CacheCategory(Group.class, Role.class, Person.class, PersonAttribute.class, Unit.class, + UnitDuty.class, UnitAttribute.class, Identity.class); } public EntityManagerContainer entityManagerContainer() { @@ -128,9 +128,9 @@ public class Business { public RoleFactory role() throws ExceptionRoleFactory { if (null == this.role) { - try{ + try { this.role = new RoleFactory(this); - } catch (Exception e){ + } catch (Exception e) { throw new ExceptionRoleFactory(e); } } @@ -214,8 +214,8 @@ public class Business { return true; } } - if (ListTools.isNotEmpty(unit.getInheritedControllerList())) { - List os = this.person().pick(unit.getInheritedControllerList()); + for (Unit u : unit().pick(unit().listSupNested(unit.getId()))) { + List os = this.person().pick(u.getControllerList()); List list = ListTools.extractProperty(os, JpaObject.DISTINGUISHEDNAME, String.class, true, true); if (ListTools.contains(list, effectivePerson.getDistinguishedName())) { return true; diff --git a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/factory/UnitFactory.java b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/factory/UnitFactory.java index 6f93a37232713a7e9333e0925b2d420ac2da7ef1..f7c2098703d139d0bb858ec4c2e5832b5935b14f 100644 --- a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/factory/UnitFactory.java +++ b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/factory/UnitFactory.java @@ -219,13 +219,13 @@ public class UnitFactory extends AbstractFactory { // Collections.reverse(names); names.add(o.getName()); o.setLevelName(StringUtils.join(names, PersistenceProperties.Unit.levelNameSplit)); - List inheritControllerList = new ArrayList<>(); - for (Unit u : list) { - if (ListTools.isNotEmpty(u.getControllerList())) { - inheritControllerList.addAll(u.getControllerList()); - } - } - o.setInheritedControllerList(ListTools.trim(inheritControllerList, true, true)); +// List inheritControllerList = new ArrayList<>(); +// for (Unit u : list) { +// if (ListTools.isNotEmpty(u.getControllerList())) { +// inheritControllerList.addAll(u.getControllerList()); +// } +// } +// o.setInheritedControllerList(ListTools.trim(inheritControllerList, true, true)); } } diff --git a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionDelete.java b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionDelete.java index 261f358e859a6a2c7b6c82b3582f9c163f80b606..25299ac103f2ac8c11421b867608f47e88254697 100644 --- a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionDelete.java +++ b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionDelete.java @@ -153,7 +153,7 @@ class ActionDelete extends BaseAction { List os = em.createQuery(cq.select(root).where(p)).getResultList().stream().distinct().collect(Collectors.toList()); for (Unit o : os) { o.getControllerList().remove(person.getId()); - o.getInheritedControllerList().remove(person.getId()); + //o.getInheritedControllerList().remove(person.getId()); } } diff --git a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListPinyinInitial.java b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListPinyinInitial.java index 9066d268e4a6ae787f5654a9f4f02a5042c0e67a..50b312b90ef6f4a6dad258d8de4f873d34c45705 100644 --- a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListPinyinInitial.java +++ b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListPinyinInitial.java @@ -18,6 +18,8 @@ import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; +import com.x.base.core.project.cache.Cache.CacheKey; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.gson.GsonPropertyObject; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; @@ -26,8 +28,6 @@ import com.x.base.core.project.tools.StringTools; import com.x.organization.assemble.control.Business; import com.x.organization.core.entity.Person; import com.x.organization.core.entity.Person_; -import com.x.base.core.project.cache.Cache.CacheKey; -import com.x.base.core.project.cache.CacheManager; class ActionListPinyinInitial extends BaseAction { diff --git a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/BaseAction.java b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/BaseAction.java index 8884031a919318a38f067c6c9c279162a242e9fb..7851a1131828a6ce0e66d509fd55e84d0cab5bc4 100644 --- a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/BaseAction.java +++ b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/BaseAction.java @@ -1,5 +1,6 @@ package com.x.organization.assemble.control.jaxrs.person; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -162,12 +163,16 @@ abstract class BaseAction extends StandardJaxrsAction { if (null != person && t.getControllerList().contains(person.getId())) { List identities = this.listIdentity(business, t); List units = this.listUnit(business, identities); + List supUnits = new ArrayList<>(); + for (Unit u : units) { + supUnits.addAll(business.unit().listSupNestedObject(u)); + } + units.addAll(supUnits); if (ListTools.isNotEmpty(units)) { allowEdit = false; allowDelete = true; for (Unit o : units) { - if (o.getControllerList().contains(person.getId()) - || o.getInheritedControllerList().contains(person.getId())) { + if (o.getControllerList().contains(person.getId())) { allowEdit = true; } else { allowDelete = false; diff --git a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/unit/ActionCreate.java b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/unit/ActionCreate.java index 38fa7440ccbd19c8476dbe43311e68d39d530ac4..e0a580365c0762fea55d04ac2b92cc9e0a8509c3 100644 --- a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/unit/ActionCreate.java +++ b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/unit/ActionCreate.java @@ -22,7 +22,7 @@ import org.apache.commons.lang3.StringUtils; class ActionCreate extends BaseAction { private static Logger logger = LoggerFactory.getLogger(ActionCreate.class); - + ActionResult execute(EffectivePerson effectivePerson, JsonElement jsonElement) throws Exception { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { ActionResult result = new ActionResult<>(); @@ -55,7 +55,7 @@ class ActionCreate extends BaseAction { if (this.duplicateUniqueWhenNotEmpty(business, unit)) { throw new ExceptionDuplicateUnique(unit.getName(), unit.getUnique()); } - if (this.checkNameInvalid(business,unit)){ + if (this.checkNameInvalid(business, unit)) { throw new ExceptionNameInvalid(unit.getName()); } /** 判断同一级别下name不重复 */ @@ -64,14 +64,14 @@ class ActionCreate extends BaseAction { } emc.beginTransaction(Unit.class); business.unit().adjustInherit(unit); - emc.persist(unit,CheckPersistType.all); + emc.persist(unit, CheckPersistType.all); emc.commit(); CacheManager.notify(Unit.class); - - /**创建 组织变更org消息通信 */ - OrgMessageFactory orgMessageFactory = new OrgMessageFactory(); + + /** 创建 组织变更org消息通信 */ + OrgMessageFactory orgMessageFactory = new OrgMessageFactory(); orgMessageFactory.createMessageCommunicate("add", "unit", unit, effectivePerson); - + Wo wo = new Wo(); wo.setId(unit.getId()); result.setData(wo); @@ -86,11 +86,14 @@ class ActionCreate extends BaseAction { private static final long serialVersionUID = -6314932919066148113L; +// static WrapCopier copier = WrapCopierFactory.wi(Wi.class, Unit.class, null, +// ListTools.toList(JpaObject.FieldsUnmodify, Unit.pinyin_FIELDNAME, +// Unit.pinyinInitial_FIELDNAME, Unit.level_FIELDNAME, Unit.levelName_FIELDNAME, +// Unit.inheritedControllerList_FIELDNAME)); + static WrapCopier copier = WrapCopierFactory.wi(Wi.class, Unit.class, null, - ListTools.toList(JpaObject.FieldsUnmodify, Unit.pinyin_FIELDNAME, - Unit.pinyinInitial_FIELDNAME, Unit.level_FIELDNAME, Unit.levelName_FIELDNAME, - Unit.inheritedControllerList_FIELDNAME)); + ListTools.toList(JpaObject.FieldsUnmodify, Unit.pinyin_FIELDNAME, Unit.pinyinInitial_FIELDNAME, + Unit.level_FIELDNAME, Unit.levelName_FIELDNAME)); } - } diff --git a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/unit/ActionEdit.java b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/unit/ActionEdit.java index e46261b3b08b99bf5e05537800e0a40cc7c32fc2..fa69dcb9d42acb36a8a1f06aa1bb4d1a55f7f19e 100644 --- a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/unit/ActionEdit.java +++ b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/unit/ActionEdit.java @@ -46,7 +46,7 @@ class ActionEdit extends BaseAction { Unit unit = business.unit().pick(flag); Unit oldUnit = unit; boolean checkFlag = false; - + if (null == unit) { throw new ExceptionUnitNotExist(flag); } @@ -62,15 +62,16 @@ class ActionEdit extends BaseAction { unit = emc.find(unit.getId(), Unit.class); Gson gsontool = new Gson(); String strOriginalUnit = gsontool.toJson(unit); - - unit.setControllerList(ListTools.extractProperty(business.person().pick(ListTools.trim(unit.getControllerList(), true, true)), + + unit.setControllerList(ListTools.extractProperty( + business.person().pick(ListTools.trim(unit.getControllerList(), true, true)), JpaObject.id_FIELDNAME, String.class, true, true)); Wi.copier.copy(wi, unit); /** 如果唯一标识不为空,要检查唯一标识是否唯一 */ if (this.duplicateUniqueWhenNotEmpty(business, unit)) { throw new ExceptionDuplicateUnique(unit.getName(), unit.getUnique()); } - if (this.checkNameInvalid(business,unit)){ + if (this.checkNameInvalid(business, unit)) { throw new ExceptionNameInvalid(unit.getName()); } /** 判断同一级别下name不重复 */ @@ -78,23 +79,23 @@ class ActionEdit extends BaseAction { throw new ExceptionDuplicateName(unit.getName()); } /** 判断是否修改了组织级别或组织名称,如果修改了，需要重新计算当前组织及下属组织的组织级别 */ - checkFlag = this.checkUnitTypeName(oldUnit,unit); - if(checkFlag){ + checkFlag = this.checkUnitTypeName(oldUnit, unit); + if (checkFlag) { business.unit().adjustInherit(unit); } emc.check(unit, CheckPersistType.all); emc.commit(); CacheManager.notify(Unit.class); - + /** 判断是否修改了组织级别或组织名称,如果修改了，需要重新计算当前组织及下属组织成员的身份（组织名称，组织级别名称） */ - if(checkFlag){ + if (checkFlag) { this.updateIdentityUnitNameAndUnitLevelName(effectivePerson, flag, jsonElement); } - /**创建 组织变更org消息通信 */ - OrgMessageFactory orgMessageFactory = new OrgMessageFactory(); - orgMessageFactory.createMessageCommunicate("modfiy", "unit",strOriginalUnit, unit, effectivePerson); - + /** 创建 组织变更org消息通信 */ + OrgMessageFactory orgMessageFactory = new OrgMessageFactory(); + orgMessageFactory.createMessageCommunicate("modfiy", "unit", strOriginalUnit, unit, effectivePerson); + Wo wo = new Wo(); wo.setId(unit.getId()); result.setData(wo); @@ -111,18 +112,23 @@ class ActionEdit extends BaseAction { private static final long serialVersionUID = -7527954993386512109L; - // static WrapCopier copier = WrapCopierFactory.wi(Wi.class, Unit.class, null, - // ListTools.toList(JpaObject.FieldsUnmodify, Unit.superior_FIELDNAME, Unit.pinyin_FIELDNAME, - // Unit.pinyinInitial_FIELDNAME, Unit.level_FIELDNAME, Unit.levelName_FIELDNAME, - // Unit.inheritedControllerList_FIELDNAME)); + // static WrapCopier copier = WrapCopierFactory.wi(Wi.class, + // Unit.class, null, + // ListTools.toList(JpaObject.FieldsUnmodify, Unit.superior_FIELDNAME, + // Unit.pinyin_FIELDNAME, + // Unit.pinyinInitial_FIELDNAME, Unit.level_FIELDNAME, Unit.levelName_FIELDNAME, + // Unit.inheritedControllerList_FIELDNAME)); +// static WrapCopier copier = WrapCopierFactory.wi(Wi.class, Unit.class, null, +// ListTools.toList(JpaObject.FieldsUnmodify, Unit.pinyin_FIELDNAME, Unit.pinyinInitial_FIELDNAME, Unit.level_FIELDNAME, +// Unit.levelName_FIELDNAME, Unit.inheritedControllerList_FIELDNAME)); static WrapCopier copier = WrapCopierFactory.wi(Wi.class, Unit.class, null, - ListTools.toList(JpaObject.FieldsUnmodify, Unit.pinyin_FIELDNAME, Unit.pinyinInitial_FIELDNAME, Unit.level_FIELDNAME, - Unit.levelName_FIELDNAME, Unit.inheritedControllerList_FIELDNAME)); + ListTools.toList(JpaObject.FieldsUnmodify, Unit.pinyin_FIELDNAME, Unit.pinyinInitial_FIELDNAME, + Unit.level_FIELDNAME, Unit.levelName_FIELDNAME)); } - //根据组织标志列出身份列表 + // 根据组织标志列出身份列表 private List listIdentityByUnitFlag(Business business, Unit unit) throws Exception { - //Unit unit = business.unit().pick(unitFlag); + // Unit unit = business.unit().pick(unitFlag); if (null == unit.getId() || StringUtils.isEmpty(unit.getId()) || null == unit) { throw new ExceptionUnitNotExist(unit.getId()); } @@ -135,9 +141,9 @@ class ActionEdit extends BaseAction { return os; } - //列出所有递归下级组织（包含当前组织） + // 列出所有递归下级组织（包含当前组织） private List listUnit(Business business, String flag) throws Exception { - //Unit unit = business.unit().pick(flag); + // Unit unit = business.unit().pick(flag); EntityManager em = business.entityManagerContainer().get(Unit.class); CriteriaBuilder cb = em.getCriteriaBuilder(); @@ -158,17 +164,18 @@ class ActionEdit extends BaseAction { throw new ExceptionUnitNotExist(flag); } - //所有下级组织 + // 所有下级组织 List os = business.unit().listSubNestedObject(unit); - //把当前组织加入到os + // 把当前组织加入到os List _currentUnitSingleArray = new ArrayList(); _currentUnitSingleArray.add(unit); os = ListTools.add(_currentUnitSingleArray, true, true, os); return os; } - void updateIdentityUnitNameAndUnitLevelName(EffectivePerson effectivePerson, String flag, JsonElement jsonElement) throws Exception { + void updateIdentityUnitNameAndUnitLevelName(EffectivePerson effectivePerson, String flag, JsonElement jsonElement) + throws Exception { CacheManager.notify(Unit.class); try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { Business business = new Business(emc); @@ -185,7 +192,7 @@ class ActionEdit extends BaseAction { } /* * 同时更新unit下的所有身份的UnitLevelName，UnitName - * */ + */ List unitList = this.listUnit(business, flag); for (Unit u : unitList) { @@ -209,17 +216,16 @@ class ActionEdit extends BaseAction { } } - + private boolean checkUnitTypeName(Unit oldUnit, Unit unit) throws Exception { List oldUnitType = oldUnit.getTypeList(); List unitType = unit.getTypeList(); - //判断两个list是否相同 - if (oldUnitType.retainAll(unitType) || (!StringUtils.equals(oldUnit.getName(), unit.getName())) || (!StringUtils.equals(oldUnit.getSuperior(), unit.getSuperior()))) { + // 判断两个list是否相同 + if (oldUnitType.retainAll(unitType) || (!StringUtils.equals(oldUnit.getName(), unit.getName())) + || (!StringUtils.equals(oldUnit.getSuperior(), unit.getSuperior()))) { return true; } return false; } - - } diff --git a/o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/factory/UnitFactory.java b/o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/factory/UnitFactory.java index 157a22d086b4218ad95b789b8393db4da61d107c..98b5f34c6e78330c490c409323e11b3e13521ea4 100644 --- a/o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/factory/UnitFactory.java +++ b/o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/factory/UnitFactory.java @@ -221,11 +221,11 @@ public class UnitFactory extends AbstractFactory { names = names.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList()); names.add(o.getName()); o.setLevelName(StringUtils.join(names, "/")); - List inheritControllerList = new ArrayList<>(); - for (Unit u : list) { - inheritControllerList.addAll(u.getControllerList()); - } - o.setInheritedControllerList(ListTools.trim(inheritControllerList, true, true)); +// List inheritControllerList = new ArrayList<>(); +// for (Unit u : list) { +// inheritControllerList.addAll(u.getControllerList()); +// } +// o.setInheritedControllerList(ListTools.trim(inheritControllerList, true, true)); } } diff --git a/o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/unit/ActionListObject.java b/o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/unit/ActionListObject.java index 61737291b6e10ebd852990b80f6e63884cf7d3b5..16c7812379da4c8a82d3d33672cad6eade85611a 100644 --- a/o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/unit/ActionListObject.java +++ b/o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/unit/ActionListObject.java @@ -34,6 +34,7 @@ import javax.persistence.criteria.Root; class ActionListObject extends BaseAction { private static Logger logger = LoggerFactory.getLogger(ActionListObject.class); + @SuppressWarnings("unchecked") ActionResult> execute(EffectivePerson effectivePerson, JsonElement jsonElement) throws Exception { @@ -81,8 +82,11 @@ class ActionListObject extends BaseAction { @FieldDescribe("直接下级身份数量") private Long subDirectIdentityCount = 0L; +// static WrapCopier copier = WrapCopierFactory.wo(Unit.class, Wo.class, null, +// ListTools.toList(JpaObject.FieldsInvisible,Unit.controllerList_FIELDNAME,Unit.inheritedControllerList_FIELDNAME)); + static WrapCopier copier = WrapCopierFactory.wo(Unit.class, Wo.class, null, - ListTools.toList(JpaObject.FieldsInvisible,Unit.controllerList_FIELDNAME,Unit.inheritedControllerList_FIELDNAME)); + ListTools.toList(JpaObject.FieldsInvisible, Unit.controllerList_FIELDNAME)); public String getMatchKey() { return matchKey; @@ -114,7 +118,7 @@ class ActionListObject extends BaseAction { List wos = new ArrayList<>(); for (String str : wi.getUnitList()) { Unit o = business.unit().pick(str); - if(o!=null){ + if (o != null) { Wo wo = Wo.copier.copy(o); wo.setMatchKey(str); if (StringUtils.isNotEmpty(wo.getSuperior())) { diff --git a/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/factory/UnitFactory.java b/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/factory/UnitFactory.java index 3a8a58dcb976ba18983ea9871fb27a855b9afc97..178e90c2797a7931eec631df9142f0ed8c6d3a2a 100644 --- a/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/factory/UnitFactory.java +++ b/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/factory/UnitFactory.java @@ -210,11 +210,11 @@ public class UnitFactory extends AbstractFactory { // Collections.reverse(names); names.add(o.getName()); o.setLevelName(StringUtils.join(names, PersistenceProperties.Unit.levelNameSplit)); - List inheritControllerList = new ArrayList<>(); - for (Unit u : list) { - inheritControllerList.addAll(u.getControllerList()); - } - o.setInheritedControllerList(ListTools.trim(inheritControllerList, true, true)); +// List inheritControllerList = new ArrayList<>(); +// for (Unit u : list) { +// inheritControllerList.addAll(u.getControllerList()); +// } +// o.setInheritedControllerList(ListTools.trim(inheritControllerList, true, true)); } } diff --git a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Unit.java b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Unit.java index 7651c4d7a7a88b8058ae461d22f12f7d704bad5e..45d0c9c624e657c7caf069d74c96a0d1000fe232 100644 --- a/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Unit.java +++ b/o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/Unit.java @@ -189,17 +189,17 @@ public class Unit extends SliceJpaObject { @CheckPersist(allowEmpty = true, citationExists = @CitationExist(type = Person.class)) private List controllerList; - public static final String inheritedControllerList_FIELDNAME = "inheritedControllerList"; - @FieldDescribe("继承自上级组织的管理人员.") - @PersistentCollection(fetch = FetchType.EAGER) - @OrderColumn(name = ORDERCOLUMNCOLUMN) - @ContainerTable(name = TABLE + ContainerTableNameMiddle - + inheritedControllerList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle - + inheritedControllerList_FIELDNAME + JoinIndexNameSuffix)) - @ElementColumn(length = JpaObject.length_id, name = ColumnNamePrefix + inheritedControllerList_FIELDNAME) - @ElementIndex(name = TABLE + IndexNameMiddle + inheritedControllerList_FIELDNAME + ElementIndexNameSuffix) - @CheckPersist(allowEmpty = true, citationExists = @CitationExist(type = Person.class)) - private List inheritedControllerList; +// public static final String inheritedControllerList_FIELDNAME = "inheritedControllerList"; +// @FieldDescribe("继承自上级组织的管理人员.") +// @PersistentCollection(fetch = FetchType.EAGER) +// @OrderColumn(name = ORDERCOLUMNCOLUMN) +// @ContainerTable(name = TABLE + ContainerTableNameMiddle +// + inheritedControllerList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle +// + inheritedControllerList_FIELDNAME + JoinIndexNameSuffix)) +// @ElementColumn(length = JpaObject.length_id, name = ColumnNamePrefix + inheritedControllerList_FIELDNAME) +// @ElementIndex(name = TABLE + IndexNameMiddle + inheritedControllerList_FIELDNAME + ElementIndexNameSuffix) +// @CheckPersist(allowEmpty = true, citationExists = @CitationExist(type = Person.class)) +// private List inheritedControllerList; public static final String dingdingId_FIELDNAME = "dingdingId"; @FieldDescribe("钉钉部门ID.") @@ -351,13 +351,13 @@ public class Unit extends SliceJpaObject { this.distinguishedName = distinguishedName; } - public List getInheritedControllerList() { - return inheritedControllerList; - } - - public void setInheritedControllerList(List inheritedControllerList) { - this.inheritedControllerList = inheritedControllerList; - } +// public List getInheritedControllerList() { +// return inheritedControllerList; +// } +// +// public void setInheritedControllerList(List inheritedControllerList) { +// this.inheritedControllerList = inheritedControllerList; +// } public String getDescription() { return description;