TRX 1 год назад
Родитель
Сommit
2c00642d4f

+ 1 - 1
FullCardClient/src/main/java/com/zhongshu/card/client/type/user/OrgUserState.java

@@ -8,7 +8,7 @@ import lombok.Getter;
 public enum OrgUserState {
     Unaudited("审核中"),
     Refusal("已拒绝"),
-    Formal("正式"),
+    Formal("已通过"),
     ;
 
     @Getter

+ 2 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationUserServiceImpl.java

@@ -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());