修改功能和增加上传功能

Pu Zhibing

4 天以前 adc8542adeabbcbeff425d6471762c04e8f3cffe

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

@@ -145,12 +145,14 @@
                returnList.add(carModel);
            }
        }
        TServerCarmodel carModel = new TServerCarmodel();
        carModel.setId(type.getId());
        carModel.setName(type.getName());
        carModel.setIsCheck(type.getIsCheck().equals("1") ? "是":"否");
        carModel.setPriceType(null);
        returnList.add(carModel);
        if(null != type){
            TServerCarmodel carModel = new TServerCarmodel();
            carModel.setId(type.getId());
            carModel.setName(type.getName());
            carModel.setIsCheck(type.getIsCheck().equals("1") ? "是":"否");
            carModel.setPriceType(null);
            returnList.add(carModel);
        }
        return returnList;
    }

@@ -208,7 +210,7 @@

        //拼车设置
        SpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<SpellOrderRule>().eq("companyId", ShiroExtUtil.getUser().getObjectId()));
        model.addAttribute("spellOrderRule", JSONObject.parseObject(spellOrderRule.getContent()));
        model.addAttribute("spellOrderRule", null == spellOrderRule ? "" : JSONObject.parseObject(spellOrderRule.getContent()));

        //报警电话
        TPhone phone1 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroExtUtil.getUser().getObjectId()).eq("type", 1));