修改bug

puzhibing

2026-01-23 e9259901aa1137ab81c309ccc30aaa34e4e6993f

修改bug

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

@@ -111,6 +111,8 @@
    private ShiroExtUtil shiroExtUtil;
    @Autowired
    private IDriverWorkService iDriverWorkService;
    @Autowired
    private ITRegionService regionService;

    /**
     * 跳转投诉页面
@@ -1742,6 +1744,25 @@
                        driver.setAddType(2);
                        driver.setAddObjectId(shiroExtUtil.getUser().getObjectId());
                        driver.setPlaceOfEmployment(cell201);
                        if(ToolUtil.isNotEmpty(cell201)){
                            TRegion tRegion = regionService.selectOne(new EntityWrapper<TRegion>().eq("code", cell201));
                            String placeOfPractice = "";
                            if(null != tRegion){
                                Integer parentId = tRegion.getParentId();
                                if(0 != parentId){
                                    TRegion tRegion1 = regionService.selectById(parentId);
                                    if(0 != tRegion1.getParentId()){
                                        TRegion tRegion2 = regionService.selectById(tRegion1.getParentId());
                                        placeOfPractice = tRegion2.getName() + "," + tRegion1.getName() + "," + tRegion.getName();
                                    }else{
                                        placeOfPractice = tRegion1.getName() + "," + tRegion.getName();
                                    }
                                }else{
                                    placeOfPractice = tRegion.getName();
                                }
                            }
                            driver.setPlaceOfPractice(placeOfPractice);
                        }
                        if (SinataUtil.isNotEmpty(eight)) {
                            driver.setDriverAddress(eight);
                        }

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

@@ -133,8 +133,13 @@
            roleList.add(0);
        }
        List<Relation> relations = relationService.selectList(new EntityWrapper<Relation>().in("roleid", roleList));
        Set<Long> collect = relations.stream().map(Relation::getMenuid).collect(Collectors.toSet());
        List<Menu> menuList = menuService.selectBatchIds(collect);
        if(!relations.isEmpty()){
            Set<Long> collect = relations.stream().map(Relation::getMenuid).collect(Collectors.toSet());
            List<Menu> menuList = menuService.selectBatchIds(collect);
            shiroUser.setMenuIds(menuList.stream().map(Menu::getUrl).collect(Collectors.toList()));
        }else{
            shiroUser.setMenuIds(new ArrayList<>());
        }
        List<MenuNode> menus = menuService.getMenusByRoleIds(roleList);
        // 根据企业经营范围过滤菜单（在构建树之前过滤）
        TCompany tCompany = companyMapper.selectById(shiroUser.getObjectId());
@@ -143,7 +148,6 @@
        }
        List<MenuNode> titles = MenuNode.buildTitle(menus);
        titles = ApiMenuFilter.build(titles);
        shiroUser.setMenuIds(menuList.stream().map(Menu::getUrl).collect(Collectors.toList()));
        
        
        model.addAttribute("titles", titles);

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml

@@ -137,7 +137,14 @@

    <!--根据审核通过的司机列表-->
    <select id="getDriverList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
        SELECT * FROM (SELECT cc1.`name` as companyName,cc2.`name` as franchiseeName,if(dw.driverId is null, '', ci.carLicensePlate) as carLicensePlate,if(dw.driverId is null, '', CONCAT(IFNULL(cb.name,''), IFNULL(cm.name,''))) as carName,ds.serverStr,IFNULL(oe.evaluateNum,0) as evaluateNum,
        SELECT * FROM (
        SELECT
            cc1.`name` as companyName,
            cc2.`name` as franchiseeName,
            if(dw.driverId is null, '', ci.carLicensePlate) as carLicensePlate,
            if(dw.driverId is null, '', CONCAT(IFNULL(cb.name,''), IFNULL(cm.name,''))) as carName,
            ds.serverStr,
            IFNULL(oe.evaluateNum,0) as evaluateNum,
        (IFNULL(ot1.taxiNum, 0) + IFNULL(ot3.num, 0) + IFNULL(ot5.num, 0) + IFNULL(ot7.num, 0)) as historyNum,
        (IFNULL(ot2.taxiMoney, 0)+ IFNULL(ot4.money, 0) + IFNULL(ot6.money, 0) + IFNULL(ot8.money, 0)) as historyMoney,
        dd.* from t_driver as dd

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java

@@ -82,6 +82,10 @@
     */
    private String placeOfEmployment;
    /**
     * 从业地（带分隔符）
     */
    private String placeOfPractice;
    /**
     * 生日
     */
    private Date birthday;
@@ -868,7 +872,15 @@
    public void setEmpnew(Integer empnew) {
        this.empnew = empnew;
    }
    

    public String getPlaceOfPractice() {
        return placeOfPractice;
    }

    public void setPlaceOfPractice(String placeOfPractice) {
        this.placeOfPractice = placeOfPractice;
    }

    @Override
    protected Serializable pkVal() {
        return this.id;

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java

@@ -44,7 +44,12 @@

    @Override
    public List<Map<String, Object>> getDriverList(Page<Map<String, Object>> page, Integer roleType,Integer nowUserId,String beginTime, String endTime, String companyName, String phone, String name, Integer addType, Integer authState) {
        return this.baseMapper.getDriverList(page,roleType,nowUserId, beginTime, endTime, companyName, phone, name, addType, authState);
        List<Map<String, Object>> driverList = this.baseMapper.getDriverList(page, roleType, nowUserId, beginTime, endTime, companyName, phone, name, addType, authState);
        for (Map<String, Object> stringObjectMap : driverList) {
//            stringObjectMap

        }
        return driverList;
    }

    @Override