|
|
@@ -669,7 +669,6 @@ public class AdminApiController extends CertifyApiController {
|
|
|
UserIdentityFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
|
|
|
if (null == userIdentity.getUid()) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
|
|
|
@@ -688,7 +687,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
|
|
|
ui.setProcess(IdentityProcess.COMMITTED.getCode());
|
|
|
ui.setAuditStatus(IdentityAuditStatus.COMMITTED.getCode());
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isBlank(ui.getId())) {
|
|
|
ui.setId(UUID.randomUUID().toString());
|
|
|
res.setData(userIdentityService.insertByAdmin(ui, null, null));
|
|
|
@@ -2933,7 +2932,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
List<Admin> list = adminService.selectCognizancePrincipal();
|
|
|
Map<String, String> map = new TreeMap<String, String>();
|
|
|
for (Admin o : list) {
|
|
|
- map.put(o.getId(), o.getName() + " " + o.getPosition());
|
|
|
+ map.put(o.getId(), o.getName() + " " + (null == o.getPosition() ? "" : o.getPosition()));
|
|
|
}
|
|
|
res.setData(map);
|
|
|
return res;
|