Merge remote-tracking branch 'origin/dev' into dev

pz-system/src/main/resources/mapper/merchant/EmployeesMapper.xml

@@ -83,20 +83,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         e.id,
         e.`name`
         <!--<if test="bo.favorableRate = 0">
-            HAVING
-            satisfaction_rate >= #{bo.favorableRate};
+            HAVING satisfaction_rate >= #{bo.favorableRate};
         </if>-->
-        <if test="bo.favorableRate == 1">
-            HAVING
-            satisfaction_rate &gt;= 90 and satisfaction_rate &lt;= 100
-        </if>
         <if test="bo.favorableRate == 2">
             HAVING
-            satisfaction_rate &gt;= 80 and satisfaction_rate &lt;= 90
+            satisfaction_rate between 90 and 100
         </if>
         <if test="bo.favorableRate == 3">
             HAVING
-            satisfaction_rate &lt;= 80
+            satisfaction_rate between 80 and  90
+        </if>
+        <if test="bo.favorableRate == 4">
+            HAVING
+            <![CDATA[ satisfaction_rate <= 80 ]]>
         </if>
         ORDER BY satisfaction_rate desc
     </select>