Antiloveg 8 years ago
parent
commit
cb2198cadb

+ 9 - 4
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -1528,12 +1528,13 @@ public class AdminApiController extends CertifyApiController {
 		OrgActivityCost oac = new OrgActivityCost();
 		BeanUtils.copyProperties(orgActivityCost, oac);
 
-		if (null != orgActivityCostService.selectOrgActivityCostByAidAndYear(oac.getAid(), oac.getYear())) {
-			res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目当前年份费用详情已录入!"));
-			return res;
-		}
+		OrgActivityCost ccc = orgActivityCostService.selectOrgActivityCostByAidAndYear(oac.getAid(), oac.getYear());
 
 		if (StringUtils.isBlank(oac.getId())) {
+			if (null != ccc) {
+				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目当前年份费用详情已录入!"));
+				return res;
+			}
 			OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(oac.getAid());
 			if (null != ac) {
 				Calendar c = Calendar.getInstance();
@@ -1556,6 +1557,10 @@ public class AdminApiController extends CertifyApiController {
 				return res;
 			}
 		} else {
+			if (null != ccc && !ccc.getId().equals(oac.getId())) {
+				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目当前年份费用详情已录入!"));
+				return res;
+			}
 			orgActivityCostService.updateByPrimaryKeySelective(oac);
 		}
 		return res;

+ 7 - 3
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -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;