Merge branch 'feature-V2.0' of ssh://git.mooctest.com:1022/crowd-2019/crowd-test-service-backend into feature-V2.0

core/src/main/java/com/mooctest/crowd/domain/model/EvaluationAgencyPO.java

@@ -60,4 +60,12 @@ public class EvaluationAgencyPO{
     @Column(name = "EA_IDNUM")
     private  String idCardNum;
 
+    @Column(name = "EA_IDCARD_BACK_OHOTO")
+    private  String  idCardBackPhoto;//身份证反面照片
+
+
+    @Column(name = "EA_IDCARD_POSITIVE_PHOTO")
+    private   String idCardPositivePhoto;//身份证正面照片
+
+
 }

core/src/main/java/com/mooctest/crowd/domain/repository/UserRepo.java

@@ -280,17 +280,22 @@ public class UserRepo implements IUserRepo {
         if (evaluationAgency != null) {
             EvaluationAgencyPO evaluationAgencyPO = Converter.convert(EvaluationAgencyPO.class, evaluationAgency);
             evaluationAgencyPO.setUserId(userPO.getId());
+            System.out.println(evaluationAgencyPO+"xxxxxxxxxxxxxxxxxxxxxxxx");
             evaluationAgencyPO = evaluationAgencyDao.save(evaluationAgencyPO);
             List<EvaluationAgencyResource> resources = evaluationAgency.getEvaluationAgencyResourceList();
             List<EvaluationAgencyAbility> abilities = evaluationAgency.getEvaluationAgencyAbilityList();
-            for (EvaluationAgencyResource resource : resources) {
-                resource.setEvaluationAgencyId(evaluationAgencyPO.getId());
-                resourceRepo.saveEvaluationAgencyResource(resource);
-            }
-            for (EvaluationAgencyAbility ability : abilities) {
-                ability.setEvaluationAgencyId(evaluationAgencyPO.getId());
-                resourceRepo.saveEvaluationAgencyAbility(ability);
-            }
+           if(resources!=null) {
+               for (EvaluationAgencyResource resource : resources) {
+                   resource.setEvaluationAgencyId(evaluationAgencyPO.getId());
+                   resourceRepo.saveEvaluationAgencyResource(resource);
+               }
+           }
+           if(abilities!=null) {
+               for (EvaluationAgencyAbility ability : abilities) {
+                   ability.setEvaluationAgencyId(evaluationAgencyPO.getId());
+                   resourceRepo.saveEvaluationAgencyAbility(ability);
+               }
+           }
 //            // save测评机构资源
 //            EvaluationAgencyResource evaluationAgencyResource = evaluationAgency.getEvaluationAgencyResource();
 //            if(evaluationAgencyResource != null){

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

@@ -22,6 +22,7 @@ public class ApplyAgencyAuthCommand{
 
     @NotNull(message = "身份证号码不能为空")
     private  String  IdCardNum;
+
     @NotNull(message = "请选择性别")
     private String sex;
 //    @NotNull(message = "机构名称不可为空")
@@ -48,11 +49,11 @@ public class ApplyAgencyAuthCommand{
     public EvaluationAgency toAgency(){
         EvaluationAgency agency = UserFactory.defaultAgency();
         BeanUtils.copyProperties(this, agency, "evaluationAgencyAbilityList", "evaluationAgencyResourceList");
-        if(this.evaluationAgencyAbilityList.size() > 0 && this.evaluationAgencyAbilityList != null){
+        if( this.evaluationAgencyAbilityList != null&&this.evaluationAgencyAbilityList.size() > 0 ){
             agency.setEvaluationAgencyAbilityList(this.evaluationAgencyAbilityList.stream().map(EvaluationAgencyAbility::new).collect(Collectors.toList()));
 
         }
-        if(this.evaluationAgencyResourceList.size() > 0 && this.evaluationAgencyResourceList != null){
+        if( this.evaluationAgencyResourceList != null&&this.evaluationAgencyResourceList.size() > 0){
             agency.setEvaluationAgencyAbilityList(this.evaluationAgencyAbilityList.stream().map(EvaluationAgencyAbility::new).collect(Collectors.toList()));
             agency.setEvaluationAgencyResourceList(this.evaluationAgencyResourceList.stream().map(AgencyResourceCommand::toAgencyResource).collect(Collectors.toList()));
         }