修复同时使用HasMany和HasManyThrough在haswhere中主表名字不一致问题导致sql错误问题（没有详细测试过现在能跑而已）

[ganluo960214]

修复同时使用HasMany和HasManyThrough在haswhere中主表名字不一致问题导致sql错误问题（没有详细测试过现在能跑而已）

<?php

namespace app\controller;

use app\BaseController;
use think\Model;
use think\response\Json;

class ZhongDianRenWu extends Model{
    function ZhongDianRenWuChengBanDanWei()
    {
        return $this->hasMany(ZhongDianRenWuChengBanDanWei::Class,'zhong_dian_ren_wu_id');
    }
    function ZhongDianRenWuShangBaoNeiRong()
    {
        return $this->hasManyThrough(ZhongDianRenWuShangBaoNeiRong::Class,  ZhongDianRenWuChengBanDanWei::Class);
    }
}
class ZhongDianRenWuChengBanDanWei extends Model{

}
class ZhongDianRenWuShangBaoNeiRong extends Model{

}

class Index extends BaseController
{
    public function index()
    {
        $zhongYaoRenWuModel = new ZhongDianRenWu();
        $zhongYaoRenWuModel = $zhongYaoRenWuModel->with([
            'ZhongDianRenWuChengBanDanWei',
            'ZhongDianRenWuShangBaoNeiRong',
        ])->haswhere(
            'ZhongDianRenWuChengBanDanWei',[]
        )->haswhere(
            'ZhongDianRenWuShangBaoNeiRong',[]
        )->page(PAGE)->limit(LIMIT)->select();


        return \json($zhongYaoRenWuModel);
    }

}

修复前

SELECT 
    `ZhongDianRenWu`.*, `zhong_dian_ren_wu`.* --  `zhong_dian_ren_wu`.* 会被移除
FROM
    `zhong_dian_ren_wu` `zhong_dian_ren_wu`
        JOIN
    `zhong_dian_ren_wu_cheng_ban_dan_wei` `ZhongDianRenWuChengBanDanWei` ON `ZhongDianRenWu`.`id` = `ZhongDianRenWuChengBanDanWei`.`zhong_dian_ren_wu_id`
        INNER JOIN
    `zhong_dian_ren_wu_cheng_ban_dan_wei` ON `zhong_dian_ren_wu_cheng_ban_dan_wei`.`zhong_dian_ren_wu_id` = `zhong_dian_ren_wu`.`id`
        JOIN
    `zhong_dian_ren_wu_shang_bao_nei_rong` ON `zhong_dian_ren_wu_shang_bao_nei_rong`.`zhong_dian_ren_wu_cheng_ban_dan_wei_id` = `zhong_dian_ren_wu_cheng_ban_dan_wei`.`id`
GROUP BY `zhong_dian_ren_wu_shang_bao_nei_rong`.`zhong_dian_ren_wu_cheng_ban_dan_wei_id`
LIMIT 0 , 20;

修复后

SELECT 
    `ZhongDianRenWu`.*
FROM
    `zhong_dian_ren_wu` `ZhongDianRenWu`
        JOIN
    `zhong_dian_ren_wu_cheng_ban_dan_wei` `ZhongDianRenWuChengBanDanWei` ON `ZhongDianRenWu`.`id` = `ZhongDianRenWuChengBanDanWei`.`zhong_dian_ren_wu_id`
        INNER JOIN
    `zhong_dian_ren_wu_cheng_ban_dan_wei` ON `zhong_dian_ren_wu_cheng_ban_dan_wei`.`zhong_dian_ren_wu_id` = `ZhongDianRenWu`.`id`
        JOIN
    `zhong_dian_ren_wu_shang_bao_nei_rong` ON `zhong_dian_ren_wu_shang_bao_nei_rong`.`zhong_dian_ren_wu_cheng_ban_dan_wei_id` = `zhong_dian_ren_wu_cheng_ban_dan_wei`.`id`
GROUP BY `zhong_dian_ren_wu_shang_bao_nei_rong`.`zhong_dian_ren_wu_cheng_ban_dan_wei_id`
LIMIT 0 , 20;

[ganluo960214]

会引发其他bug