Merge remote-tracking branch 'origin/master'

Pu Zhibing

7 天以前 e998c057be6d077dcec169ab4cb34f4755932601

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java

@@ -14,7 +14,6 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.*;


@@ -52,6 +51,7 @@

        Integer carId = driver.getCarId();
        map.put("car", "");
        map.put("id", carId);
        if(carId!=null){
            Car car = carMapper.selectById(carId);
            if(car.getCarLicensePlate()!=null){
@@ -69,7 +69,7 @@
            if(stringObjectMap.get("useDriverId")!=null && stringObjectMap.get("useDriverId").toString().equals(uid.toString())){
                map.put("useState", 1);
            }else {
                map.put("useState", 0);
                map.put("useState", 2);
            }
        }
        map.put("list", list);
@@ -163,7 +163,7 @@
    @Override
    public boolean useState(Integer carId, Integer uid) {
        Car car = carMapper.selectById(carId);
        if(car.getUseDriverId()!=null || !car.getUseDriverId().equals(uid)){
        if(car.getUseDriverId()!=null && !car.getUseDriverId().equals(uid)){
            return false;
        }
        return true;