diff --git a/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java b/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java index 7aa2c96f..fee7e4ef 100644 --- a/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java +++ b/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java @@ -42,7 +42,7 @@ public class ExtendTitlePO { private String isShow; - private Integer creator; + private Long creator; private Integer deleteType; private Date createTime; private Date updateTime; diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index dfb267aa..ab4e7471 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -107,7 +107,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ } if (null == extendTitle.getId()) { - extendTitle.setCreator(user.getUID()); + extendTitle.setCreator((long)user.getUID()); extendTitle.setCreateTime(new Date()); extendTitle.setDeleteType(0); getExtendTitleMapper().insertIgnoreNull(extendTitle); @@ -137,7 +137,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ extendTitle.setIsShow(param.getIsShow()); extendTitle.setTitle(param.getGroupName()); extendTitle.setShowOrder(null == extendTitlePO ? 0 : extendTitlePO.getShowOrder() + 1); - extendTitle.setCreator(user.getUID()); + extendTitle.setCreator((long)user.getUID()); extendTitle.setCreateTime(new Date()); extendTitle.setDeleteType(0); getExtendTitleMapper().insertIgnoreNull(extendTitle); @@ -150,16 +150,31 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ public void changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { if (fieldTypeTreeParam.getId() == null) { - ExtendGroupPO extendGroupPO = buildExtentGroupType(moduleTypeEnum, fieldTypeTreeParam); + ExtendGroupPO extendGroupPO = buildExtendGroupType(moduleTypeEnum, fieldTypeTreeParam); MapperProxyFactory.getProxy(ExtendGroupMapper.class).insertIgnoreNull(extendGroupPO); + //默认新增title + ExtendTitlePO extendTitlePO = buildExtendTitleType(extendGroupPO); + MapperProxyFactory.getProxy(ExtendTitleMapper.class).insertIgnoreNull(extendTitlePO); }else { MapperProxyFactory.getProxy(ExtendGroupMapper.class).update(fieldTypeTreeParam.getId(),fieldTypeTreeParam.getName()); } } + private ExtendTitlePO buildExtendTitleType(ExtendGroupPO extendGroupPO) { + return ExtendTitlePO.builder() + .groupId(extendGroupPO.getId()) + .title(extendGroupPO.getGroupName()) + .showOrder(1) + .isShow("1") + .creator((long) user.getUID()) + .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) + .createTime(new Date()) + .updateTime(new Date()).build(); + } + - private ExtendGroupPO buildExtentGroupType(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { + private ExtendGroupPO buildExtendGroupType(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { return ExtendGroupPO.builder() .extendType(moduleTypeEnum.getValue()) .groupName(fieldTypeTreeParam.getName()) @@ -169,7 +184,6 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ .updateTime(new Date()) .pid(fieldTypeTreeParam.getParentid()) .isShow(fieldTypeTreeParam.getIsShow() == null ? "1" : fieldTypeTreeParam.getIsShow()).build(); - }