|
|
@@ -418,7 +418,7 @@ public class OrganizationUserServiceImpl extends SuperService {
|
|
|
if (ObjectUtils.isEmpty(organizationUser)) {
|
|
|
return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, param.getId()));
|
|
|
}
|
|
|
- if (param.getOrgUserState() != OrgUserState.Unaudited) {
|
|
|
+ if (organizationUser.getOrgUserState() != OrgUserState.Unaudited) {
|
|
|
return ResultContent.buildFail("数据已审核");
|
|
|
}
|
|
|
BeanUtils.copyProperties(param, organizationUser);
|
|
|
@@ -429,6 +429,7 @@ public class OrganizationUserServiceImpl extends SuperService {
|
|
|
// 拒绝
|
|
|
organizationUser.setState(UserState.Locked);
|
|
|
}
|
|
|
+
|
|
|
UserAccount userAccount = getCurrentUserAccount();
|
|
|
organizationUser.setReViewUserId(userAccount.getUserId());
|
|
|
organizationUser.setReViewUserName(userAccount.getCreateUserName());
|