修改bug

Pu Zhibing

3 天以前 a0af42a6acfc7a0ebbb92bffc1816525e508af70

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

@@ -662,11 +662,10 @@
        tDriver.setBalance(BigDecimal.ZERO);
        tDriver.setBackgroundBalance(BigDecimal.ZERO);
        tDriver.setCommission(BigDecimal.ZERO);
        if(2 == tDriver.getApprovalStatus()){
            ShiroUser user = shiroExtUtil.getUser();
            User user2 = userService.selectById(user.getId());
            Integer objectId = user.getObjectId();
            TBranchOffice tBranchOffice = branchOfficeService.selectById(objectId);
        tDriver.setApprovalStatus(2);

        TBranchOffice tBranchOffice = branchOfficeService.selectById(tDriver.getBranchOfficeId());
        User user2 = userService.selectById(tBranchOffice.getSysUserId());
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(tDriver.getPhone(), tBranchOffice.getEnterCode());
            Long empId = null;
            Integer empnew = null;
@@ -701,8 +700,6 @@
            tDriver.setEntercode(tBranchOffice1.getEnterCode());
            tDriver.setEnterId(Long.valueOf(tBranchOffice1.getEnterCode()));
            tDriver.setEmpnew(empnew);
        }


        tDriverService.insert(tDriver);
        return SUCCESS_TIP;
@@ -836,10 +833,10 @@
        if(!b){
            return "司机姓名和身份证号不匹配";
        }
        Object o = tDriverService.addOrUpdate(tDriver);
        if(Objects.nonNull(o)){
            return o;
        }
//        Object o = tDriverService.addOrUpdate(tDriver);
//        if(Objects.nonNull(o)){
//            return o;
//        }
        tDriver.setName(tDriver.getName().replace(" ",""));
        tDriver.setEmergencyContact(tDriver.getEmergencyContact().replace(" ",""));
        tDriverService.updateById(tDriver);