Merge branch 'feature/1019-tenant' into develop-new

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantGroupMapper.xml

@@ -21,13 +21,13 @@
         FROM tenant_group t
         <where>
             <if test="param.keyword != null and param.keyword.trim() !=''">
-                t.name_ like concat('%',#{param.keyword},'%')
+               AND t.name_ like concat('%',#{param.keyword},'%')
             </if>
             <if test="param.tenantId != null">
-                t.tenant_id_ = #{param.tenantId}
+                AND t.tenant_id_ = #{param.tenantId}
             </if>
             <if test="param.adminId != null">
-                t.admin_id_ = #{param.adminId}
+                AND t.admin_id_ = #{param.adminId}
             </if>
         </where>
         ORDER BY t.id_ ASC