Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -161,6 +161,7 @@
         LEFT JOIN employee e ON su.id_=e.user_id_
         LEFT JOIN sys_user_role sur ON su.id_=sur.user_id_
         LEFT JOIN sys_role sr ON sur.role_id_=sr.id_
+        LEFT JOIN organization o ON su.organ_id_=o.id_
         <include refid="queryCondition"/>
     </select>