fix(management):0122测试bug

“mitao”

2026-01-23 803aa2d68205d6b4c6d8cab78a4e8f94ea5ea78f

fix(management):0122测试bug

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml

@@ -142,7 +142,10 @@
            cc1.`name` as companyName,
            cc2.`name` as franchiseeName,
            if(dw.driverId is null, '', ci.carLicensePlate) as carLicensePlate,
            if(dw.driverId is null, '', CONCAT(IFNULL(cb.name,''), IFNULL(cm.name,''))) as carName,
            (SELECT GROUP_CONCAT(c.carLicensePlate SEPARATOR ',')
            FROM t_car c
            WHERE c.state = 1
            AND FIND_IN_SET(dd.id, c.bindDriverId)) as carName,
            ds.serverStr,
            IFNULL(oe.evaluateNum,0) as evaluateNum,
        (IFNULL(ot1.taxiNum, 0) + IFNULL(ot3.num, 0) + IFNULL(ot5.num, 0) + IFNULL(ot7.num, 0)) as historyNum,
@@ -151,8 +154,6 @@
        LEFT JOIN (select * from t_company where type = 2 and flag != 3) as cc1 on cc1.id = dd.companyId
        LEFT JOIN (select * from t_company where type = 3 and flag != 3) as cc2 on cc2.id = dd.franchiseeId
        LEFT JOIN (select * from t_car where state = 1) as ci on ci.id = dd.carId
        LEFT JOIN (select * from t_car_brand where state = 1) as cb on cb.id = ci.carBrandId
        LEFT JOIN (select * from t_car_model where state = 1) as cm on cm.id = ci.carModelId
        LEFT JOIN (select * from t_driver_work where state = 1) as dw on dd.id = dw.driverId
        LEFT JOIN (
        SELECT

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html

@@ -29,7 +29,7 @@
                        <label class="col-sm-3 control-label">经营业务：</label>
                        <div class="col-sm-9">
                            <fieldset>
                                @if(roleType == 1 || (roleType == 2 && company.isSpe == 1)){
                                @if(roleType == 1 || (roleType != 1 && company.isSpe == 1)){
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1== item.isSpe ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox1()">
                                    <label for="checkbox1">
@@ -43,7 +43,7 @@
                                    </fieldset>
                                </div>
                                @}
                                @if(roleType == 1 || (roleType == 2 && company.isTaxi == 1)){
                                @if(roleType == 1 || (roleType != 1 && company.isTaxi == 1)){
                                <div class="checkbox checkbox-primary">
                                    <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1== item.isTaxi ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox2()">
                                    <label for="checkbox2">
@@ -58,7 +58,7 @@
                                    </fieldset>
                                </div>
                                @}
                                @if(roleType == 1 || (roleType == 2 && company.isCross == 1)){
                                @if(roleType == 1 || (roleType != 1 && company.isCross == 1)){
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1== item.isCross ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox3()">
                                    <label for="checkbox3">
@@ -108,7 +108,7 @@
                                <!--                                        </div>-->
                                <!--                                    </fieldset>-->
                                <!--                                </div>-->
                                @if(roleType == 1 || (roleType == 2 && company.isHitchRide == 1)){
                                @if(roleType == 1 || (roleType != 1 && company.isHitchRide == 1)){
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox8" name="checkbox" onclick="TCompanyInfoDlg.checkbox8()"
                                           type="checkbox" value="8"  ${1 == item.isHitchRide ? 'checked=checked' : ''}>
@@ -117,7 +117,7 @@
                                    </label>
                                </div>
                                @}
                                @if(roleType == 1 || (roleType == 2 && company.isSubstituteDriving == 1)){
                                @if(roleType == 1 || (roleType != 1 && company.isSubstituteDriving == 1)){
                                <div class="checkbox checkbox-success">
                                    <input id="checkbox9" name="checkbox" onclick="TCompanyInfoDlg.checkbox9()"
                                           type="checkbox" value="9" ${1 == item.isSubstituteDriving ? 'checked=checked' : ''}>

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js

@@ -117,7 +117,7 @@
                return btn;
            }
        },
        {title: '当前绑定车辆', field: 'carName', visible: true, align: 'center', valign: 'middle',width:'7%',
        {title: '当前绑定车辆', field: 'carName', visible: true, align: 'center', valign: 'middle',width:'12%',
            formatter: function (value, row) {
                var btn = "";
                if(row.carName != '' && row.carName != null) {