update

core/src/main/java/com/mooctest/crowd/domain/domainobject/User.java

@@ -3,9 +3,7 @@ package com.mooctest.crowd.domain.domainobject;
 import com.mooctest.crowd.domain.exception.BaseException;
 import com.mooctest.crowd.domain.exception.SystemAdministratorException;
 import com.mooctest.crowd.domain.model.UserPO;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
 
 import java.sql.Timestamp;
@@ -81,7 +79,7 @@ public class User {
      * @return
      */
     public User applyAgencyAuthentication(EvaluationAgency evaluationAgency) {
-        if (this.getPersonalAuthentication()!=null || this.getEnterpriseAuthentication()!=null || this.getPersonalAuthentication() != null)
+        if (this.getPersonalAuthentication()!=null || this.getEnterpriseAuthentication()!=null)
             throw new BaseException("已有认证信息，不可再次认证");
         this.setEvaluationAgency(evaluationAgency.applyAuthentication(this.id));
         return this;

site/src/main/java/com/mooctest/crowd/site/command/ApplyAgencyAuthCommand.java

@@ -21,7 +21,7 @@ import java.util.stream.Collectors;
 public class ApplyAgencyAuthCommand{
     @NotNull(message = "请选择性别")
     private String sex;
-    @NotNull(message = "机构名称不可为空")
+//    @NotNull(message = "机构名称不可为空")
     private String evaluationAgencyName;
     @NotNull(message = "请上传身份证正面照")
     private String idCardPositivePhoto;//身份证正面照
@@ -35,7 +35,7 @@ public class ApplyAgencyAuthCommand{
     private List<String> evaluationAgencyAbilityList;
 //    @NotNull(message = "机构资源不可为空")
     private List<AgencyResourceCommand> evaluationAgencyResourceList;
-    @NotNull(message = "LOGO不可为空")
+//    @NotNull(message = "LOGO不可为空")
     private String agencyPhoto;
     @NotNull(message = "请选择认证研发机构或者评测机构")
     private ArrayList<Integer> roleList;