去除陪诊员城市id

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

@@ -75,7 +75,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join total_order o on o.em_id = e.id
         left join company c on c.id = e.company_id
         left join sys_user s on s.user_id = e.uid
-        WHERE e.`status` = 1 and e.del_flag= 0 and e.city_id = #{bo.cityId}
+        WHERE e.`status` = 1 and e.del_flag= 0
+        <if test="bo.cityId != 0 and bo.cityId != null">
+            and e.city_id = #{bo.cityId}
+        </if>
         <if test="bo.companyId > 0">
             and e.company_id = #{bo.companyId}
         </if>