Merge remote-tracking branch 'origin/master'

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

@@ -50,7 +50,7 @@
                  LEFT JOIN mc_work_contact AS c ON a.contact_id = c.id
                  LEFT JOIN mc_corp AS p ON p.id = a.corp_id
                  LEFT JOIN mc_channel_code AS l ON l.id = a.channel_code_id
-        where 1 = 1 ${ew.sqlSegment}
+        where 1 = 1 AND ${ew.sqlSegment}
     </select>