|
@@ -489,9 +489,9 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到保存提交方式", "保存提交方式"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到保存提交方式", "保存提交方式"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
UserIdentity idd = userIdentityService.selectUserIdentityByUserId(userIdentity.getUid());
|
|
UserIdentity idd = userIdentityService.selectUserIdentityByUserId(userIdentity.getUid());
|
|
|
- if (IdentityAuditStatus.COMMITTED.getCode().equals(idd.getAuditStatus())){
|
|
|
|
|
|
|
+ if (IdentityAuditStatus.COMMITTED.getCode().equals(idd.getAuditStatus())) {
|
|
|
res.getError().add(buildError("", "审核中,无法保存或提交!"));
|
|
res.getError().add(buildError("", "审核中,无法保存或提交!"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
@@ -597,9 +597,9 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "保存提交方式"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "保存提交方式"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
OrganizationIdentity idd = organizationIdentityService.selectOrgIdentityByUserId(orgIdentity.getUid());
|
|
OrganizationIdentity idd = organizationIdentityService.selectOrgIdentityByUserId(orgIdentity.getUid());
|
|
|
- if (IdentityAuditStatus.COMMITTED.getCode().equals(idd.getAuditStatus())){
|
|
|
|
|
|
|
+ if (IdentityAuditStatus.COMMITTED.getCode().equals(idd.getAuditStatus())) {
|
|
|
res.getError().add(buildError("", "审核中,无法保存或提交!"));
|
|
res.getError().add(buildError("", "审核中,无法保存或提交!"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
@@ -1017,6 +1017,14 @@ public class AdminApiController extends CertifyApiController {
|
|
|
if (!checkCertify(res, orgIntellectualProperty.getUid()).getError().isEmpty()) {
|
|
if (!checkCertify(res, orgIntellectualProperty.getUid()).getError().isEmpty()) {
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ OrgIntellectualProperty p = orgIntellectualPropertyService.findByUidAndIntellectualPropertyNumber(
|
|
|
|
|
+ orgIntellectualProperty.getUid(), orgIntellectualProperty.getIntellectualPropertyNumber());
|
|
|
|
|
+ if (null != p) {
|
|
|
|
|
+ res.getError().add(buildError("", "当前知识产权编号已录入,无法重复提交!"));
|
|
|
|
|
+ return res;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if (!StringUtils.isBlank(authorizationDateFormattedDate)) {
|
|
if (!StringUtils.isBlank(authorizationDateFormattedDate)) {
|
|
|
try {
|
|
try {
|
|
|
orgIntellectualProperty.setAuthorizationDate(
|
|
orgIntellectualProperty.setAuthorizationDate(
|