|
@@ -415,20 +415,23 @@ public class UserRepo implements IUserRepo {
|
|
|
}
|
|
|
//获取用户能力
|
|
|
String abilityName="";
|
|
|
+ List<String> codeList=new ArrayList<>();
|
|
|
List<String> abailities = new ArrayList<>();
|
|
|
- if(userPO.getPersonalCompetence()!=null){
|
|
|
- abailities= Arrays.asList(userPO.getPersonalCompetence().split(","));
|
|
|
+ if(userPO.getPersonalCompetence()!=null&&!userPO.getPersonalCompetence().trim().equals("")){
|
|
|
+ codeList= Arrays.asList(userPO.getPersonalCompetence().split(","));
|
|
|
}
|
|
|
- {
|
|
|
+
|
|
|
+ if(abailities!=null&&!codeList.isEmpty()){
|
|
|
+
|
|
|
for (int i = 0; i < abailities.size(); i++) {
|
|
|
- if(testTypeDao.findByCode(abailities.get(i)).get().getName()!=null) {
|
|
|
- abilityName = testTypeDao.findByCode(abailities.get(i)).get().getName();
|
|
|
+ abilityName = testTypeDao.findByCode(codeList.get(i)).get().getName();
|
|
|
abailities.add(abilityName);
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- }
|
|
|
+
|
|
|
userResult.setPersonAbilities(abailities);
|
|
|
+
|
|
|
/*获取区域管理员信息*/
|
|
|
List<RegionalManagerToRegionalPO> regionalManagerToRegionalPOList = regionalManagerToRegionalDao.findByUserIdAndIsDeleted(userPO.getId(), DeletedStatus.isNotDeleted);
|
|
|
if (regionalManagerToRegionalPOList.size() > 0) {
|