增加对值为null的判断 修改了部分可能报空的判断。

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

@@ -49,14 +49,14 @@ public class ApplyAgencyAuthCommand{
     public EvaluationAgency toAgency(){
         EvaluationAgency agency = UserFactory.defaultAgency();
         BeanUtils.copyProperties(this, agency, "evaluationAgencyAbilityList", "evaluationAgencyResourceList");
-//        if(this.evaluationAgencyAbilityList.size() > 0 && this.evaluationAgencyAbilityList != null){
-//            agency.setEvaluationAgencyAbilityList(this.evaluationAgencyAbilityList.stream().map(EvaluationAgencyAbility::new).collect(Collectors.toList()));
-//
-//        }
-//        if(this.evaluationAgencyResourceList.size() > 0 && this.evaluationAgencyResourceList != null){
-//            agency.setEvaluationAgencyAbilityList(this.evaluationAgencyAbilityList.stream().map(EvaluationAgencyAbility::new).collect(Collectors.toList()));
-//            agency.setEvaluationAgencyResourceList(this.evaluationAgencyResourceList.stream().map(AgencyResourceCommand::toAgencyResource).collect(Collectors.toList()));
-//        }
+        if( this.evaluationAgencyAbilityList != null&&this.evaluationAgencyAbilityList.size() > 0 ){
+            agency.setEvaluationAgencyAbilityList(this.evaluationAgencyAbilityList.stream().map(EvaluationAgencyAbility::new).collect(Collectors.toList()));
+
+        }
+        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()));
+        }
         agency.setType(JSONObject.toJSONString(this.roleList));
         agency.setIsDeleted(0);
         agency.setIsAuthentication(0);