修改bug

Pu Zhibing

1 天以前 bf612288a7667989b2d6686dbdc4f50d2b6015b3

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

@@ -101,13 +101,14 @@
     */
    @RequestMapping("/tCar_add")
    public String tCarAdd(Model model) {
        List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
        List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2).eq("state", 1).ne("flag", 3));
        model.addAttribute("companyList",companyList);

        Integer roleType = ShiroKit.getUser().getRoleType();
        model.addAttribute("roleType",roleType);
        if (2 == roleType){
            List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()));
            List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3)
                    .eq("superiorId",ShiroKit.getUser().getObjectId()).eq("state", 1).ne("flag", 3));
            model.addAttribute("franchiseeList",franchiseeList);
        }else{
            model.addAttribute("franchiseeList",null);
@@ -466,27 +467,31 @@
     */
    @RequestMapping(value = "/delete")
    @ResponseBody
    public Object delete(@RequestParam Integer tCarId) {
        TCar tCar = tCarService.selectById(tCarId);
        tCar.setState(2);
        tCarService.updateById(tCar);
    public Object delete(@RequestParam String tCarId) {
        for (String s : tCarId.split(",")) {
            TCar tCar = tCarService.selectById(s);
            tCar.setState(2);
            tCarService.updateById(tCar);

        //清除相对应的司机关联车辆ID
        List<TDriver> list = tDriverService.selectList(new EntityWrapper<TDriver>().eq("carId", tCarId));
        for (TDriver obj : list){
            obj.setCarId(null);
            tDriverService.updateById(obj);
            //清除相对应的司机关联车辆ID
            List<TDriver> list = tDriverService.selectList(new EntityWrapper<TDriver>().eq("carId", s));
            for (TDriver obj : list){
                obj.setCarId(null);
                tDriverService.updateById(obj);
            }

            new Thread(new Runnable() {
                @Override
                public void run() {
                    if(pushMinistryOfTransport){//上传数据
                        pushMinistryOfTransportUtil.baseInfoCompanyStat();
                        pushMinistryOfTransportUtil.baseInfoVehicle(tCar.getId());
                    }
                }
            }).start();
        }

        new Thread(new Runnable() {
            @Override
            public void run() {
                if(pushMinistryOfTransport){//上传数据
                    pushMinistryOfTransportUtil.baseInfoCompanyStat();
                    pushMinistryOfTransportUtil.baseInfoVehicle(tCar.getId());
                }
            }
        }).start();

        return SUCCESS_TIP;
    }