|
|
|
@ -604,11 +604,11 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification |
|
|
|
@Transactional |
|
|
|
public List<PlmBmPropertiesValueData> searchBMPropertiesValue(SearchBMData data){ |
|
|
|
//查询header表 有没有数据 |
|
|
|
List<PlmBmPropertiesValueHeaderData> check=technicalSpecificationMapper.checkPlmBmPropertiesValueHeaderData(data); |
|
|
|
if(check.size()==0){ |
|
|
|
List<PlmBmModelHeaderData> checkHeader=technicalSpecificationMapper.checkBMModelHeader(data); |
|
|
|
if(checkHeader.size()>0){ |
|
|
|
if(checkHeader.get(0).getPropertiesCodeNo()!=null&&!"".equals(checkHeader.get(0).getPropertiesCodeNo())){ |
|
|
|
List<PlmBmPropertiesValueHeaderData> check = technicalSpecificationMapper.checkPlmBmPropertiesValueHeaderData(data); |
|
|
|
if (check.isEmpty()) { |
|
|
|
List<PlmBmModelHeaderData> checkHeader = technicalSpecificationMapper.checkBMModelHeader(data); |
|
|
|
if (!checkHeader.isEmpty()) { |
|
|
|
if (checkHeader.get(0).getPropertiesCodeNo() != null && !"".equals(checkHeader.get(0).getPropertiesCodeNo())) { |
|
|
|
technicalSpecificationMapper.savePlmBmPropertiesValueHeaderData(data); |
|
|
|
technicalSpecificationMapper.savePlmBmPropertiesValueData(data); |
|
|
|
} |
|
|
|
@ -616,7 +616,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification |
|
|
|
} |
|
|
|
List<PlmBmPropertiesValueData> result= technicalSpecificationMapper.searchBMPropertiesValue(data); |
|
|
|
for (int i = 0; i <result.size() ; i++) { |
|
|
|
if("Y".equals(result.get(i).getValueChooseFlag())){ |
|
|
|
if ("Y".equals(result.get(i).getValueChooseFlag())) { |
|
|
|
List<PlmPropertiesItemAvailableData> availableList = technicalSpecificationMapper.getAvailableValueList(result.get(i)); |
|
|
|
result.get(i).setAvailableValueList(availableList); |
|
|
|
} |
|
|
|
@ -1293,10 +1293,10 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
if(falseFlag){ |
|
|
|
if (falseFlag) { |
|
|
|
throw new RuntimeException("跳转路径未在系统维护,无法跳转!"); |
|
|
|
} |
|
|
|
if (StringUtils.isEmpty(account)){ |
|
|
|
if (StringUtils.isEmpty(account)) { |
|
|
|
throw new RuntimeException("未绑定域控账号!"); |
|
|
|
} |
|
|
|
if (!checkLdapDirectory.checkUserLdapDirectory(account,baseUrl)) { |
|
|
|
|