修改后台司机授权逻辑判断

Pu Zhibing

14 小时以前 2506c3f8e3ef1ace4a258a8c5f93ddd47a51bbd2

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java

@@ -84,6 +84,12 @@
    private CarInsuranceMapper carInsuranceMapper;
    @Autowired
    private ShiroExtUtil shiroExtUtil;

    @Autowired
    private ITDriverService driverService;

    @Autowired
    private IDriverWorkService driverWorkService;
    
    
    @Value("${pushMinistryOfTransport}")
@@ -115,7 +121,8 @@
        }
        //查询当前用户所属分公司/加盟商
        model.addAttribute("objectName", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getName());
    
        model.addAttribute("objectId", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getId());

        //车辆品牌
        List<TCarBrand> brandList = tCarBrandService.selectList(new EntityWrapper<TCarBrand>().eq("state", 1));
        model.addAttribute("brandList",brandList);
@@ -157,7 +164,8 @@
        Integer roleType = shiroExtUtil.getUser().getRoleType();
        model.addAttribute("roleType", roleType);
        model.addAttribute("objectName", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getName());
    
        model.addAttribute("objectId", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getId());

        if (1 == roleType) {
            List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2).eq("state", 0).ne("flag", 3));
            model.addAttribute("companyList", companyList);
@@ -241,7 +249,7 @@
        Integer roleType = shiroExtUtil.getUser().getRoleType();
        model.addAttribute("roleType", roleType);
        model.addAttribute("objectName", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getName());

        model.addAttribute("objectId", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getId());
        if (1 == roleType) {
            List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2).eq("state", 0).ne("flag", 3));
            model.addAttribute("companyList", companyList);
@@ -695,6 +703,8 @@
        }).start();
        return SUCCESS_TIP;
    }


    @RequestMapping(value = "/update1")
    @ResponseBody
    public Object update1(TCar tCar,String bindDriverId) {
@@ -702,6 +712,16 @@
        if(bindDriverId==null){
            bindDriverId="";
        }
        List<TDriver> tDrivers = driverService.selectList(new EntityWrapper<TDriver>().eq("carId", tCar.getId()).ne("flag", 3));
        for (TDriver tDriver : tDrivers) {
            DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", tDriver.getId()).eq("state", 1));
            if(null != driverWork){
                return new ErrorTip(500, tDriver.getName() + "司机正在上班中，不能取消授权");
            }else{
                tDriver.setCarId(null);
                driverService.updateAllColumnById(tDriver);
            }
        }
        obj.setBindDriverId(bindDriverId);
        tCarService.updateById(obj);
        return SUCCESS_TIP;