|
|
@@ -399,12 +399,18 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "当前用户已注册!"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
- if (UserType.ORGANIZATION.getCode().equals(inputUser.getType()) && StringUtils.isBlank(inputUser.getUnitName())){
|
|
|
+
|
|
|
+ if (UserType.ORGANIZATION.getCode().equals(inputUser.getType())
|
|
|
+ && StringUtils.isBlank(inputUser.getUnitName())) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "公司名称", "公司名称"));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
+ if (UserType.PERSONAL.getCode().equals(inputUser.getType()) && StringUtils.isBlank(inputUser.getUsername())) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "用户名称", "用户名称"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
User u = new User();
|
|
|
u.setId(UUID.randomUUID().toString());
|
|
|
u.setMobile(inputUser.getMobile().trim());
|
|
|
@@ -416,7 +422,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
u.setPassword(passwordUtil.getEncryptPwd(u));
|
|
|
u.setLvl(UserLevel.GENERAL.getCode());
|
|
|
u.setAid(TokenManager.getAdminId());
|
|
|
- userService.insertRegister(u, "", inputUser.getUnitName());
|
|
|
+ userService.insertRegister(u, "", inputUser.getUnitName(), inputUser.getUsername());
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -468,10 +474,10 @@ public class AdminApiController extends CertifyApiController {
|
|
|
UserIdentityFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
return res;
|
|
|
}
|
|
|
- boolean insertFlag = Boolean.FALSE;
|
|
|
+
|
|
|
if (StringUtils.isBlank(userIdentity.getId())) {
|
|
|
- userIdentity.setId(UUID.randomUUID().toString());
|
|
|
- insertFlag = Boolean.TRUE;
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到认证ID", "认证ID"));
|
|
|
+ return res;
|
|
|
}
|
|
|
|
|
|
if (StringUtils.isBlank(userIdentity.getUid())) {
|
|
|
@@ -483,11 +489,11 @@ 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())){
|
|
|
+ if (UserLevel.GENERAL.getCode().equals(u.getLvl())) {
|
|
|
res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -505,21 +511,20 @@ public class AdminApiController extends CertifyApiController {
|
|
|
} catch (ParseException e) {
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
|
|
|
UserIdentity ui = new UserIdentity();
|
|
|
BeanUtils.copyProperties(userIdentity, ui);
|
|
|
|
|
|
if (CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
|
|
|
User u = userService.selectByPrimaryKey(userIdentity.getUid());
|
|
|
- if (!UserLevel.GENERAL.getCode().equals(u.getLvl())){
|
|
|
+ if (!UserLevel.GENERAL.getCode().equals(u.getLvl())) {
|
|
|
res.getError().add(buildError("", "已通过实名认证,无法操作!"));
|
|
|
return res;
|
|
|
}
|
|
|
ui.setProcess(IdentityProcess.COMMITTED.getCode());
|
|
|
ui.setAuditStatus(IdentityAuditStatus.COMMITTED.getCode());
|
|
|
}
|
|
|
- res.setData(userIdentityService.updateUserDetail(ui, saveSign, level, insertFlag));
|
|
|
+ res.setData(userIdentityService.updateUserDetail(ui, saveSign, level));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -590,7 +595,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
Integer level = orgIdentity.getLevel();
|
|
|
if (!UserLevel.GENERAL.getCode().equals(level)) {
|
|
|
User u = userService.selectByPrimaryKey(orgIdentity.getUid());
|
|
|
- if (UserLevel.GENERAL.getCode().equals(u.getLvl())){
|
|
|
+ if (UserLevel.GENERAL.getCode().equals(u.getLvl())) {
|
|
|
res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -605,7 +610,15 @@ public class AdminApiController extends CertifyApiController {
|
|
|
|
|
|
OrganizationIdentity oi = new OrganizationIdentity();
|
|
|
BeanUtils.copyProperties(orgIdentity, oi);
|
|
|
-
|
|
|
+ if (CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
|
|
|
+ User u = userService.selectByPrimaryKey(oi.getUid());
|
|
|
+ if (!UserLevel.GENERAL.getCode().equals(u.getLvl())) {
|
|
|
+ res.getError().add(buildError("", "已通过实名认证,无法操作!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ oi.setProcess(IdentityProcess.COMMITTED.getCode());
|
|
|
+ oi.setAuditStatus(IdentityAuditStatus.COMMITTED.getCode());
|
|
|
+ }
|
|
|
res.setData(organizationIdentityService.updateOrgDetail(oi, saveSign, level));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -762,7 +775,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 删除团体人力资源
|
|
|
*
|
|
|
@@ -778,8 +791,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 企业参与国家标准或行业标准制定情况明细列表
|
|
|
*/
|
|
|
@@ -1185,7 +1197,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
if (StringUtils.isBlank(otp.getId())) {
|
|
|
OrgTechProduct product = orgTechProductService.findBySerialNumberAndUid(otp.getSerialNumber(),
|
|
|
otp.getUid());
|
|
|
- if (null != product){
|
|
|
+ if (null != product) {
|
|
|
res.getError().add(buildError("", "产品编号重复,无法保存!"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -2232,7 +2244,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (!checkCertify(res, orgTechCenter.getUid()).getError().isEmpty()) {
|
|
|
return res;
|
|
|
}
|
|
|
@@ -2872,7 +2884,8 @@ public class AdminApiController extends CertifyApiController {
|
|
|
* 高企培育列表
|
|
|
*/
|
|
|
@RequestMapping(value = "/cultivate", method = RequestMethod.POST)
|
|
|
- public Result cultivationList(String uid, Integer locationProvince, String unitName, String pageNo, String pageSize) {
|
|
|
+ public Result cultivationList(String uid, Integer locationProvince, String unitName, String pageNo,
|
|
|
+ String pageSize) {
|
|
|
Result res = new Result();
|
|
|
Integer pNo = 1;
|
|
|
Integer pSize = 10;
|