|
|
@@ -1427,10 +1427,10 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
|
|
|
OrgActivityCost oac = new OrgActivityCost();
|
|
|
BeanUtils.copyProperties(orgActivityCost, oac);
|
|
|
-
|
|
|
+ OrgActivityCost ccc = orgActivityCostService.selectOrgActivityCostByUidAndAid(oac.getAid(),
|
|
|
+ TokenManager.getUserId());
|
|
|
if (StringUtils.isBlank(oac.getId())) {
|
|
|
- if (null != orgActivityCostService.selectOrgActivityCostByUidAndAid(oac.getAid(),
|
|
|
- TokenManager.getUserId())) {
|
|
|
+ if (null != ccc) {
|
|
|
res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -1443,6 +1443,10 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
oac.setDeletedSign(DeleteStatus.UNDELETE.getCode());
|
|
|
orgActivityCostService.insert(oac);
|
|
|
} else {
|
|
|
+ if (null != ccc && !ccc.getId().equals(oac.getId())){
|
|
|
+ res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
orgActivityCostService.updateByPrimaryKeySelective(oac);
|
|
|
}
|
|
|
return res;
|