Merge branch 'master' of http://git.mokasz.com/marketing/moka-private

src/main/java/com/mokamrp/privates/mapper/WorkContactEmployeeMapper.xml

@@ -54,6 +54,7 @@
                  LEFT JOIN private_group_corp AS g ON a.corp_id = g.corp_id
 				 LEFT JOIN private_group AS h ON h.id = g.group_id
         where 1 = 1 AND ${ew.sqlSegment}
+        group by a.id
         LIMIT #{limit} offset #{offset}
     </select>
 

src/main/java/com/mokamrp/privates/service/impl/WorkContactRoomServiceImpl.java

@@ -51,7 +51,7 @@ public class WorkContactRoomServiceImpl extends ServiceImpl<WorkContactRoomMappe
             //.这里sql字段需要驼峰转下划线
             if (op.get(key) == null || op.get(key).isEmpty() || op.get(key).toString().equals("=")) {
                 warpper.eq(StringUtils.humpToLine2(key.toString()), value.toString());
-            } else if (op.get(key).toString().equals("like")) {
+            } else if (op.get(key).toString().equals("LIKE")) {
                 warpper.and(wrapper -> wrapper.like(StringUtils.humpToLine2(key.toString()), "%" + value.toString() + "%")
                         .or().like("c.name", "%" + value.toString() + "%"));
             }