java/IgoTravel.git

			@@ -264,11 +264,11 @@
			and serverCarModelId = #{serverCarModelId}
			</if>
			)
			) as aa where aa.id not in (
			) as aa <!--where aa.id not in (
			select driverId from t_order_private_car where isDelete = 1 and driverPay = 1 and state in (7, 8, 9)
			union all
			select driverId from t_order_logistics where isDelete = 1 and driverPay = 1 and state != 10
			)
			)-->
			</select>


			@@ -320,12 +320,12 @@
			select
			a.id as id,
			a.headImgUrl as avatar,
			CONCAT(a.firstName, " ", a.lastName) as as `name`,
			CONCAT(a.firstName, " ", a.lastName) as `name`,
			a.phone as phone,
			a.idCard as idcode,
			b.carLicensePlate as licensePlate,
			b.carColor as carColor,
			CONCAT(d.`name`, c.`name`) as brand,
			CONCAT(d.`name`, " ", c.`name`) as brand,
			if((select count(id) from t_driver_work where state = 1 and driverId = a.id) = 0, 1, if(
			(
			(select count(id) from t_order_private_car where state not in (6, 7, 8, 9, 10, 12) and driverId = a.id) +
			@@ -349,7 +349,7 @@
			select
			id as id,
			phone as phone,
			CONCAT(firstName, " ", lastName) as as name,
			CONCAT(firstName, " ", lastName) as name,
			headImgUrl as avatar,
			DATE_FORMAT(insertTime,'%Y/%m/%d %H:%i') as insertTime
			from