合并代码

Pu Zhibing

9 天以前 4231cb0417322b6b974210d31ff4cbd8a842da96

 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.*;


@@ -163,7 +162,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;