|
|
@@ -1363,7 +1363,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
if (!checkCertify(res, orgActivity.getUid()).getError().isEmpty()) {
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isBlank(orgActivity.getActivityNumber())) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "研发活动编号"));
|
|
|
return res;
|
|
|
@@ -1391,7 +1391,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
|
|
|
OrgActivity oa = new OrgActivity();
|
|
|
BeanUtils.copyProperties(orgActivity, oa);
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isBlank(oa.getId())) {
|
|
|
oa.setId(UUID.randomUUID().toString());
|
|
|
oa.setDeletedSign(DeleteStatus.UNDELETE.getCode());
|
|
|
@@ -2811,8 +2811,14 @@ public class AdminApiController extends CertifyApiController {
|
|
|
BeanUtils.copyProperties(u, user);
|
|
|
|
|
|
if (StringUtils.isBlank(user.getId())) {
|
|
|
- user.setId(UUID.randomUUID().toString());
|
|
|
- userAbilityService.insert(user);
|
|
|
+ UserAbility uu = userAbilityService.selectUserAbilityByUserId(user.getUid());
|
|
|
+ if (null != uu) {
|
|
|
+ BeanUtils.copyProperties(user, uu);
|
|
|
+ userAbilityService.updateByPrimaryKeySelective(uu);
|
|
|
+ } else {
|
|
|
+ user.setId(UUID.randomUUID().toString());
|
|
|
+ userAbilityService.insert(user);
|
|
|
+ }
|
|
|
} else {
|
|
|
userAbilityService.updateByPrimaryKeySelective(user);
|
|
|
}
|