|
|
@@ -464,10 +464,11 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
|
|
|
|
if (StringUtils.isBlank(userIdentity.getId())) {
|
|
|
-
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户认证ID", "找不到用户认证ID"));
|
|
|
+ return res;
|
|
|
}
|
|
|
|
|
|
- if (null == userIdentity.getUid()) {
|
|
|
+ if (StringUtils.isBlank(userIdentity.getUid())) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -476,6 +477,15 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到保存提交方式", "保存提交方式"));
|
|
|
return res;
|
|
|
}
|
|
|
+
|
|
|
+ Integer level = userIdentity.getLevel();
|
|
|
+ if (!UserLevel.GENERAL.getCode().equals(level)) {
|
|
|
+ User u = userService.selectByPrimaryKey(userIdentity.getUid());
|
|
|
+ if (UserLevel.GENERAL.getCode().equals(u.getLvl())){
|
|
|
+ res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
if (!saveSign.equals(CertifySubmitType.SAVE.getCode())
|
|
|
&& !saveSign.equals(CertifySubmitType.SUBMIT.getCode())) {
|
|
|
@@ -497,7 +507,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
ui.setProcess(IdentityProcess.COMMITTED.getCode());
|
|
|
ui.setAuditStatus(IdentityAuditStatus.COMMITTED.getCode());
|
|
|
}
|
|
|
- res.setData(userIdentityService.updateUserDetail(ui, saveSign, userIdentity.getLevel()));
|
|
|
+ res.setData(userIdentityService.updateUserDetail(ui, saveSign, level));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -549,7 +559,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
- if (null == orgIdentity.getUid()) {
|
|
|
+ if (StringUtils.isBlank(orgIdentity.getUid())) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -564,8 +574,15 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "保存提交方式"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
- //if (null == )
|
|
|
+
|
|
|
+ Integer level = orgIdentity.getLevel();
|
|
|
+ if (!UserLevel.GENERAL.getCode().equals(level)) {
|
|
|
+ User u = userService.selectByPrimaryKey(orgIdentity.getUid());
|
|
|
+ if (UserLevel.GENERAL.getCode().equals(u.getLvl())){
|
|
|
+ res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
if (!StringUtils.isBlank(paymentDateFormattedDate)) {
|
|
|
try {
|
|
|
@@ -577,7 +594,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
OrganizationIdentity oi = new OrganizationIdentity();
|
|
|
BeanUtils.copyProperties(orgIdentity, oi);
|
|
|
|
|
|
- res.setData(organizationIdentityService.updateOrgDetail(oi, saveSign, orgIdentity.getLevel()));
|
|
|
+ res.setData(organizationIdentityService.updateOrgDetail(oi, saveSign, level));
|
|
|
return res;
|
|
|
}
|
|
|
|