diff --git a/src/main/java/com/cm/systemcity/service/communityboss/impl/CommunityBossServiceImpl.java b/src/main/java/com/cm/systemcity/service/communityboss/impl/CommunityBossServiceImpl.java index 274a951..064e4c3 100755 --- a/src/main/java/com/cm/systemcity/service/communityboss/impl/CommunityBossServiceImpl.java +++ b/src/main/java/com/cm/systemcity/service/communityboss/impl/CommunityBossServiceImpl.java @@ -293,17 +293,16 @@ public class CommunityBossServiceImpl extends AbstractService implements ICommun @Override public List listCommunityBoss(Map params) throws SearchException { if (params.get("keywords") != null && !params.get("keywords").toString().isEmpty()) { - List userResourceBOs = userService.listResourceByKeywords(params.get("keywords").toString()); - Set userIdSet = new HashSet<>(); - userResourceBOs.forEach(userResourceBO -> { - userIdSet.add(userResourceBO.getUserId()); - }); - if (userIdSet.isEmpty()) { - return new ArrayList<>(); - } - params.put("communityBossUserIds", new ArrayList<>(userIdSet)); - params.put("communityBossParentUserIds", new ArrayList<>(userIdSet)); - + List userResourceBOs = userService.listResourceByKeywords(params.get("keywords").toString()); + Set userIdSet = new HashSet<>(); + userResourceBOs.forEach(userResourceBO -> { + userIdSet.add(userResourceBO.getUserId()); + }); + if (userIdSet.isEmpty()) { + return new ArrayList<>(); + } + params.put("communityBossUserIds", new ArrayList<>(userIdSet)); + params.remove("keywords"); } List communityBossDTOs = communityBossDao.listCommunityBoss(params); setUserInfo(communityBossDTOs); diff --git a/src/main/resources/mybatis/mapper/communityboss/communityboss-mapper.xml b/src/main/resources/mybatis/mapper/communityboss/communityboss-mapper.xml index 98fdbce..b14a3dd 100755 --- a/src/main/resources/mybatis/mapper/communityboss/communityboss-mapper.xml +++ b/src/main/resources/mybatis/mapper/communityboss/communityboss-mapper.xml @@ -196,17 +196,12 @@ AND t1.community_boss_id = #{communityBossId} - + AND ( t1.community_boss_user_id IN #{communityBossUserIds[${index}]} - OR - t1.community_boss_parent_user_id IN - - #{communityBossParentUserIds[${index}]} - )