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

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantProxyInfoServiceImpl.java

@@ -89,7 +89,7 @@ public class TenantProxyInfoServiceImpl extends ServiceImpl<TenantProxyInfoDao,
         //查询父级信息
         TenantProxyUserRelation parentProxyUser = proxyUserRelationService.getOne(Wrappers.<TenantProxyUserRelation>lambdaQuery()
                 .eq(TenantProxyUserRelation::getUserId, parentId)
-                        .isNull(TenantProxyUserRelation::getParentId)
+                .isNull(TenantProxyUserRelation::getParentId)
         );
         //添加代理商人员关系表
         TenantProxyUserRelation userRelation = new TenantProxyUserRelation();
@@ -107,7 +107,11 @@ public class TenantProxyInfoServiceImpl extends ServiceImpl<TenantProxyInfoDao,
      * @return id
      */
     private Integer addSysUser(TenantProxyDto dto) {
-        SysUser sysUser = new SysUser();
+        SysUser sysUser = sysUserFeignService.queryUserByMobile(dto.getPhone());
+        if (Objects.nonNull(sysUser)) {
+           throw new BizException("该手机号在系统已存在！");
+        }
+        sysUser = new SysUser();
         sysUser.setTenantId(-1);
         sysUser.setUsername(dto.getName());
         sysUser.setPhone(dto.getPhone());

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

@@ -55,7 +55,7 @@
             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 sys_user as b  on a.parent_id_ = b.id_
+                 left join sys_user as b  on a.user_id_ = b.id_
         where a.parent_id_ = #{id}
     </select>