Merge remote-tracking branch 'origin/master'

puzhibing

2023-02-24 39c58fe1a0469b99bd5ef0a24f6b254693826a18

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java

@@ -342,7 +342,7 @@
            itCompanyService.updateById(company);

            //设置该分公司下的所有司机状态
            itDriverService.updateCompanyDriverState(3,company.getId());
//            itDriverService.updateCompanyDriverState(3,company.getId());

        }else if (user.getRoleType() == 3){
            //查询加盟商
@@ -351,7 +351,7 @@
            itCompanyService.updateById(franchisee);

            //设置该加盟商下的所有司机状态
            itDriverService.updateFranchiseeDriverState(3,franchisee.getId());
//            itDriverService.updateFranchiseeDriverState(3,franchisee.getId());
        }
        return SUCCESS_TIP;
    }
@@ -378,7 +378,7 @@
            itCompanyService.updateById(company);

            //设置该分公司下的所有司机状态
            itDriverService.updateCompanyDriverState(2,company.getId());
//            itDriverService.updateCompanyDriverState(2,company.getId());

        }else if (user.getRoleType() == 3){
            //查询加盟商
@@ -387,7 +387,7 @@
            itCompanyService.updateById(franchisee);

            //设置该加盟商下的所有司机状态
            itDriverService.updateFranchiseeDriverState(2,franchisee.getId());
//            itDriverService.updateFranchiseeDriverState(2,franchisee.getId());
        }
        return SUCCESS_TIP;
    }