应用交付物
This commit is contained in:
+10
-1
@@ -9918,6 +9918,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
|
|
||||||
String resultMsg = "";
|
String resultMsg = "";
|
||||||
ProcessHistoryEO citePhEo = null;
|
ProcessHistoryEO citePhEo = null;
|
||||||
|
String flag = "";
|
||||||
if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
|
if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
|
||||||
resultMsg = "引用交付物成功!";
|
resultMsg = "引用交付物成功!";
|
||||||
} else {
|
} else {
|
||||||
@@ -9998,19 +9999,27 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
|
|
||||||
if (ObjectUtils.isEmpty(citePhEo)) {
|
if (ObjectUtils.isEmpty(citePhEo)) {
|
||||||
if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
|
if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
|
||||||
|
flag = "error";
|
||||||
resultMsg = "所选引用项目中,没有匹配到数据,请重新选择!";
|
resultMsg = "所选引用项目中,没有匹配到数据,请重新选择!";
|
||||||
} else {
|
} else {
|
||||||
|
flag = "error";
|
||||||
resultMsg = "There is no matching data in the selected reference project. Please reselect!";
|
resultMsg = "There is no matching data in the selected reference project. Please reselect!";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
|
if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
|
||||||
|
flag = "error";
|
||||||
resultMsg = "所选引用项目中流程完成数据为空,请重新选择!";
|
resultMsg = "所选引用项目中流程完成数据为空,请重新选择!";
|
||||||
} else {
|
} else {
|
||||||
|
flag = "error";
|
||||||
resultMsg = "The process completion data in the selected reference project is empty, please reselect!";
|
resultMsg = "The process completion data in the selected reference project is empty, please reselect!";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Result.OK(resultMsg, citePhEo);
|
if(StringUtils.isNotBlank(flag)){
|
||||||
|
return Result.error(resultMsg);
|
||||||
|
}else{
|
||||||
|
return Result.OK(resultMsg, citePhEo);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user