Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java
@@ -976,26 +976,26 @@ */ @Override public R<List<ModifyAttributeInfo>> submit(BtmAndLinkTypeDdlDTO ddlDTO) { try { //try { List<ModifyAttributeInfo> changedList = new ArrayList<>(); if (!CollectionUtils.isEmpty(ddlDTO.getBtmTypeList())) { List<BtmTypeVO> btmTypeList = ddlDTO.getBtmTypeList(); putBtm(btmTypeList.toArray(new BtmTypeVO[0])); //putBtm(btmTypeList.toArray(new BtmTypeVO[0])); changedList.addAll(checkDifferent(btmTypeList, null)); removeBtm(btmTypeList.toArray(new BtmTypeVO[0])); //removeBtm(btmTypeList.toArray(new BtmTypeVO[0])); } if (!CollectionUtils.isEmpty(ddlDTO.getLinkTypeList())) { List<LinkTypeVO> linkTypeList = ddlDTO.getLinkTypeList(); putLink(linkTypeList.toArray(new LinkTypeVO[0])); //putLink(linkTypeList.toArray(new LinkTypeVO[0])); changedList.addAll(checkDifferent(null,linkTypeList)); removeLink(linkTypeList.toArray(new LinkTypeVO[0])); //removeLink(linkTypeList.toArray(new LinkTypeVO[0])); } R<List<ModifyAttributeInfo>> result = R.success("数据库操作成功"); result.setData(changedList); return result; } catch (ServiceException e) { throw new RuntimeException(e.getMessage()); } //} catch (ServiceException e) { //throw new RuntimeException(e.getMessage()); // } } /** Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java
@@ -163,7 +163,7 @@ } /** * 根据编号集合获取属性数据对象 * 根据编号集合获取属性数据对象,其中默认的属性应当剔除 * @param attributeIdCollection 属性的编号集合 * @return 属性数据对象列表,如果有不存在的不会返回,全部不存在的则返回空列表 * @throws VciBaseException mybatis查询出错的时候会抛出异常 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
@@ -602,13 +602,12 @@ if (btmTypeDTO.isRevisionFlag()){ // 需要控制版本 // 检查使用的版本规则是否存在 if (StringUtils.isNotBlank(btmTypeDTO.getRevisionRuleId())) { if (!revisionRuleService.checkRevisionRuleExist(btmTypeDTO.getRevisionRuleId())) { throw new VciBaseException("版本规则{0}[{1}]在系统中不存在,请先查证", new Object[]{btmTypeDTO.getRevisionRuleId(), btmTypeDTO.getRevisionRuleName()}); } if (StringUtils.isNotBlank(btmTypeDTO.getRevisionRuleId())) { if (!revisionRuleService.checkRevisionRuleExist(btmTypeDTO.getRevisionRuleId())) { throw new VciBaseException("版本规则{0}[{1}]在系统中不存在,请先查证", new Object[]{btmTypeDTO.getRevisionRuleId(), btmTypeDTO.getRevisionRuleName()}); } btmTypeDTO.setAttributes(addAttributeByFieldMap(btmTypeDTO.getAttributes(),BtmTypeFieldConstant.REVISION_MANAGE_FIELD_MAP)); } } if (btmTypeDTO.isLifeCycleFlag()){ // 需要控制生命周期 @@ -626,11 +625,9 @@ // new Object[]{btmTypeDTO.getSubLifeCycleId(), btmTypeDTO.getSubLifeCycleName()}); // } // } // btmTypeDTO.setAttributes(addAttributeByFieldMap(btmTypeDTO.getAttributes(),BtmTypeFieldConstant.LIFECYCLE_MANAGE_FIELD_MAP)); } if (btmTypeDTO.isSecretFlag()){ // 需要控制密级 // btmTypeDTO.setAttributes(addAttributeByFieldMap(btmTypeDTO.getAttributes(),BtmTypeFieldConstant.SECRET_MANAGE_FIELD_MAP)); } } @Override