diff --git a/nakadai/src/main/java/com/huoran/nakadai/service/impl/PlatformTeamAccountServiceImpl.java b/nakadai/src/main/java/com/huoran/nakadai/service/impl/PlatformTeamAccountServiceImpl.java index 4edfbd3..c9f33c6 100644 --- a/nakadai/src/main/java/com/huoran/nakadai/service/impl/PlatformTeamAccountServiceImpl.java +++ b/nakadai/src/main/java/com/huoran/nakadai/service/impl/PlatformTeamAccountServiceImpl.java @@ -185,14 +185,21 @@ public class PlatformTeamAccountServiceImpl extends ServiceImpl { boolean save(Student student); - List selectOrganizationInfo(@Param("accountIds")String accounts); + List selectOrganizationInfo(@Param("openId")String openId); } diff --git a/users/src/main/java/com/huoran/users/mapper/xml/HrUserAccountMapper.xml b/users/src/main/java/com/huoran/users/mapper/xml/HrUserAccountMapper.xml index 20bf179..191d3cd 100644 --- a/users/src/main/java/com/huoran/users/mapper/xml/HrUserAccountMapper.xml +++ b/users/src/main/java/com/huoran/users/mapper/xml/HrUserAccountMapper.xml @@ -841,10 +841,7 @@ a.create_time, u.last_login_time, u.login_number, - CASE - WHEN count(ai.id) > 0 THEN ai.real_name - ELSE GROUP_CONCAT(u.user_name) - END as user_name, + GROUP_CONCAT(u.user_name) as user_name, a.work_number, GROUP_CONCAT(s.platform_name) as platformName, CASE @@ -1095,23 +1092,31 @@ AND c.is_del = 0 diff --git a/users/src/main/java/com/huoran/users/service/impl/HrUserAccountServiceImpl.java b/users/src/main/java/com/huoran/users/service/impl/HrUserAccountServiceImpl.java index d8834a5..9934266 100644 --- a/users/src/main/java/com/huoran/users/service/impl/HrUserAccountServiceImpl.java +++ b/users/src/main/java/com/huoran/users/service/impl/HrUserAccountServiceImpl.java @@ -429,11 +429,8 @@ public class HrUserAccountServiceImpl extends ServiceImpl hrUserAccount.getId().toString()) - .collect(Collectors.joining(",")); - List organizationInfoList = baseMapper.selectOrganizationInfo(accounts); + List organizationInfoList = baseMapper.selectOrganizationInfo(openId); res.setHrUserInfo(hrUserInfo); res.setOrganizationInfoList(organizationInfoList);