关联平台件提示语
This commit is contained in:
+2
-16
@@ -1367,16 +1367,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
|
|||||||
if(ObjectUtils.isEmpty(projectLawsInventoryEOS)){
|
if(ObjectUtils.isEmpty(projectLawsInventoryEOS)){
|
||||||
emptyList.add(projectLawsInventoryEO);
|
emptyList.add(projectLawsInventoryEO);
|
||||||
}
|
}
|
||||||
String msg = "";
|
|
||||||
if(CutEnum.CN.getValue().equals(cut)){
|
|
||||||
msg = "在平台件项目中包含多条匹配内容,请选择关联";
|
|
||||||
}else{
|
|
||||||
msg = " multiple matching contents are included in the platform component project, please select association";
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
|
if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
|
||||||
map.put("lawsInventoryId",projectLawsInventoryEO.getId());
|
map.put("lawsInventoryId",projectLawsInventoryEO.getId());
|
||||||
map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+msg);
|
map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle);
|
||||||
map.put("result",projectLawsInventoryEOS);
|
map.put("result",projectLawsInventoryEOS);
|
||||||
mapList.add(map);
|
mapList.add(map);
|
||||||
}else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){
|
}else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){
|
||||||
@@ -1532,16 +1525,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
|
|||||||
emptyList.add(projectLawsInventoryEO);
|
emptyList.add(projectLawsInventoryEO);
|
||||||
}
|
}
|
||||||
|
|
||||||
String msg = "";
|
|
||||||
if(CutEnum.CN.getValue().equals(cut)){
|
|
||||||
msg = "在平台件项目中包含多条匹配内容,请选择关联";
|
|
||||||
}else{
|
|
||||||
msg = " multiple matching contents are included in the platform component project, please select association";
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
|
if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
|
||||||
map.put("lawsInventoryId",projectLawsInventoryEO.getId());
|
map.put("lawsInventoryId",projectLawsInventoryEO.getId());
|
||||||
map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+msg);
|
map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle);
|
||||||
map.put("result",projectLawsInventoryEOS);
|
map.put("result",projectLawsInventoryEOS);
|
||||||
mapList.add(map);
|
mapList.add(map);
|
||||||
}else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){
|
}else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){
|
||||||
|
|||||||
Reference in New Issue
Block a user