Merge branch 'features/abcomm_sp6' of…

Merge branch 'features/abcomm_sp6' of https://gitlab.agentec.jp/abook_android/abook_check into features/#42144_and_search

# Conflicts:
#	ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ShopMemberDao.java

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ShopMemberDao.java

@@ -192,7 +192,7 @@ public class ShopMemberDao extends AbstractDao {
 		sql.append("      m_shop_member AS sm ");
 		sql.append(" INNER JOIN r_shop_member_group AS rsmg ");
 		sql.append("   ON sm.shop_member_id = rsmg.shop_member_id ");
-		sql.append(" WHERE rsmg.group_id IN (SELECT group_id FROM m_group WHERE user_group_flg = 1) ");
+		sql.append("WHERE rsmg.group_id IN (select group_id from m_shop_member sm inner join r_shop_member_group rmg on sm.shop_member_id = rmg.shop_member_id where sm.self_flg = 1) ");
 		sql.append(" AND sm.self_flg != 1 ");
 		ArrayList<String> whereSqlList = new ArrayList<String>();
 		for (String keyword : keywords) {