Merge branch 'hgw-代理商分润' into master_saas

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

@@ -54,7 +54,7 @@
             '员工' as `role`,
             c.state_ as state
         from tenant_proxy_user_relation as a
-                 left join tenant_proxy_info c on a.parent_id_ = c.proxy_user_id_
+                 left join tenant_proxy_info as c on a.parent_id_ = c.proxy_user_id_
                  left join sys_user as b  on a.user_id_ = b.id_
         where a.parent_id_ = #{id}
     </select>
@@ -69,12 +69,12 @@
             '负责人' as `role`,
             c.state_ as state
         from tenant_proxy_user_relation as a
-                 left join tenant_proxy_info c on a.user_id_ = c.proxy_user_id_
+                 left join tenant_proxy_info as c on a.user_id_ = c.proxy_user_id_
                  left join sys_user as b  on a.user_id_ = b.id_
         <where>
             a.parent_id_ is null
             <if test="param.state != null ">
-                c.state_ = #{param.state}
+               AND c.state_ = #{param.state}
             </if>
             <if test="param.search != null ">
                 AND (