|
@@ -413,13 +413,14 @@ public class UserRepo implements IUserRepo {
|
|
userResult.setEnterpriseAuthentication(Converter.convert(EnterpriseAuthentication.class, enterpriseAuthenticationPO));
|
|
userResult.setEnterpriseAuthentication(Converter.convert(EnterpriseAuthentication.class, enterpriseAuthenticationPO));
|
|
}
|
|
}
|
|
//获取用户能力
|
|
//获取用户能力
|
|
- String []abilities=userPO.getPersonalCompetence().split(",");
|
|
|
|
- List<String> abailities= new ArrayList<>();
|
|
|
|
- for(int i=0;i<abilities.length;i++){
|
|
|
|
- String abilityName=testTypeDao.findByCode(abilities[i]).get().getName();
|
|
|
|
- abailities.add(abilityName);
|
|
|
|
- }
|
|
|
|
- userResult.setPersonAbilities(abailities);
|
|
|
|
|
|
+ // 暂时注释,修改后用xu xuan 的
|
|
|
|
+// String []abilities=userPO.getPersonalCompetence().split(",");
|
|
|
|
+// List<String> abailities= new ArrayList<>();
|
|
|
|
+// for(int i=0;i<abilities.length;i++){
|
|
|
|
+// String abilityName=testTypeDao.findByCode(abilities[i]).get().getName();
|
|
|
|
+// abailities.add(abilityName);
|
|
|
|
+// }
|
|
|
|
+// userResult.setPersonAbilities(abailities);
|
|
/*获取区域管理员信息*/
|
|
/*获取区域管理员信息*/
|
|
List<RegionalManagerToRegionalPO> regionalManagerToRegionalPOList = regionalManagerToRegionalDao.findByUserIdAndIsDeleted(userPO.getId(), DeletedStatus.isNotDeleted);
|
|
List<RegionalManagerToRegionalPO> regionalManagerToRegionalPOList = regionalManagerToRegionalDao.findByUserIdAndIsDeleted(userPO.getId(), DeletedStatus.isNotDeleted);
|
|
if (regionalManagerToRegionalPOList.size() > 0) {
|
|
if (regionalManagerToRegionalPOList.size() > 0) {
|