Merge branch 'master' into frontend

ramory-l · Jan 6, 2021 · ea13272 · ea13272
2 parents b835307 + de57059
commit ea13272
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/backend/src/main/resources/ru/school/matcha/dao/UserMapper.xml b/backend/src/main/resources/ru/school/matcha/dao/UserMapper.xml
@@ -275,8 +275,9 @@
         SELECT *
         FROM "user"
         WHERE id != #{userId} AND id NOT IN (SELECT "to" FROM black_list WHERE "from" = #{userId})
-        <if test="form.man">AND gender ilike 'man'</if>
-        <if test="form.woman">AND gender ilike 'woman'</if>
+        <if test="form.man and !form.woman">AND gender ilike 'man'</if>
+        <if test="form.woman and !form.man">AND gender ilike 'woman'</if>
+        <if test="form.man and form.woman">AND gender ILIKE 'man' OR gender ILIKE 'woman'</if>
         <if test="!form.man and !form.woman">AND gender ILIKE 'man' OR gender ILIKE 'woman'</if>
         <if test="form.rateFrom != null">AND rate &gt;= #{form.rateFrom}</if>
         <if test="form.rateTo != null">AND rate &lt;= #{form.rateTo}</if>) as users