修复报空bug.

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

@@ -28,7 +28,7 @@ public class UserRepo implements IUserRepo {
     @Autowired
     private EvaluationAgencyDao agencyDao;
     @Autowired
-    private  TestTypeDao testTypeDao;
+    private TestTypeDao testTypeDao;
 
     @Autowired
     private UserDao userDao;
@@ -284,22 +284,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");
+            System.out.println(evaluationAgencyPO + "xxxxxxxxxxxxxxxxxxxxxxxx");
             evaluationAgencyPO = evaluationAgencyDao.save(evaluationAgencyPO);
             List<EvaluationAgencyResource> resources = evaluationAgency.getEvaluationAgencyResourceList();
             List<EvaluationAgencyAbility> abilities = evaluationAgency.getEvaluationAgencyAbilityList();
-           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);
-               }
-           }
+            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){
@@ -415,12 +415,16 @@ public class UserRepo implements IUserRepo {
         }
         //获取用户能力
         List<String> abailities = new ArrayList<>();
-         if(userPO.getPersonalCompetence()!=null){
-             abailities= Arrays.asList(userPO.getPersonalCompetence().split(","));
-         }
+        String  abilityName="";
+        if (userPO.getPersonalCompetence() != null) {
+            abailities = Arrays.asList(userPO.getPersonalCompetence().split(","));
+        }
         {
             for (int i = 0; i < abailities.size(); i++) {
-                String abilityName = testTypeDao.findByCode(abailities.get(i)).get().getName();
+                if(testTypeDao.findByCode(abailities.get(i)).get().getName()!=null){
+                    abilityName=testTypeDao.findByCode(abailities.get(i)).get().getName();
+                }
+
                 abailities.add(abilityName);
             }
         }
@@ -454,9 +458,6 @@ public class UserRepo implements IUserRepo {
     }
 
 
-
-
-
     private User getEvaluationInfo(User userResult) {
         /*获取测评机构信息*/
         EvaluationAgencyPO evaluationAgencyPO = evaluationAgencyDao.findByUserIdAndIsDeleted(userResult.getId(), DeletedStatus.isNotDeleted);

site/src/main/java/com/mooctest/crowd/site/controller/AgencyController.java

@@ -137,7 +137,7 @@ public class AgencyController extends BaseSearchController {
     @LoginRequired
     @RequestMapping(value = "/user/{userId}/agency", method = RequestMethod.GET)
     public ResponseVO getAgencyInfo(@PathVariable("userId") Long userId) {
-        return     new ResponseVO(ServerCode.SUCCESS ,agencyService.getDetailById(userId));
+        return  new ResponseVO(ServerCode.SUCCESS ,agencyService.getDetailById(userId));
     }
 
     @RequestMapping(value = "/agency/list", method = RequestMethod.GET)