Lee Munkyeong · @lee-mk · Kang Donghun · Kang Donghun · Lee Daehyun · Lee Daehyun
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/GroupDao.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/GroupDao.java
+	public List<GroupDto> getGroupByName(String[] keywords) {
+		StringBuffer sql = new StringBuffer();
+		sql.append(" SELECT *  ");
+		sql.append(" FROM m_group ");
+		ArrayList<String> whereSqlList = new ArrayList<String>();
+		for (String keyword : keywords) {
+			if(StringUtil.isNullOrEmpty(keyword)){
+				continue;
+			}
+			String whereSql = "group_name LIKE '%"+keyword+"%'";
+			whereSqlList.add(whereSql);
+		}
+		if (CollectionUtil.isNotEmpty(whereSqlList)) {
+			sql.append("WHERE " + StringUtil.join(" AND ", whereSqlList));
+		}
+		sql.append(" ORDER BY group_id ");
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ShopMemberDao.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ShopMemberDao.java
 		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(" AND sm.self_flg != 1");
-		sql.append(" AND sm.shop_member_name LIKE '%"+shopMemberName+"%' ");
+		sql.append(" WHERE rsmg.group_id IN (SELECT group_id FROM m_group WHERE user_group_flg = 1) ");
+		sql.append(" AND sm.self_flg != 1 ");
+		ArrayList<String> whereSqlList = new ArrayList<String>();
+		for (String keyword : keywords) {
+			if (StringUtil.isNullOrEmpty(keyword)){
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ShopMemberDao.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ShopMemberDao.java
 		sql.append(" WHERE rsmg.group_id IN (SELECT group_id FROM m_group WHERE user_group_flg = 1)");
 		sql.append(" AND sm.self_flg != 1");
 		sql.append(" AND sm.shop_member_id NOT IN (SELECT shop_member_id FROM r_chat_room_shop_member WHERE chat_room_id = ?)");
-		sql.append(" AND sm.shop_member_name LIKE '%"+shopMemberName+"%' ");
+		ArrayList<String> whereSqlList = new ArrayList<String>();
+		for (String keyword : keywords) {
+			if (StringUtil.isNullOrEmpty(keyword)){
--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
        String fixedParam = "&platform=android&isMobile=true&chatServerUrl=" + ABVEnvironment.getInstance().websocketServerHttpUrl;
        //ページをロード
        if(roomId != 0 && roomName != null) {  // by push message