最新版本541200007

jiangping

2025-03-27 e4a06e0730dc0aa6ced97cbb3362d6b8ef473d39

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java

@@ -58,6 +58,8 @@

    @Autowired
    private CarUseBookMapper carUseBookMapper;
    @Autowired
    private ApproveMapper approveMapper;

    @Autowired
    private UserActionMapper userActionMapper;
@@ -199,6 +201,11 @@
        params[2]=model.getCarCode()+"-【乘车人："+model.getMemberNames()+" 】-【预约人："+model.getMemberName()+"】-【时间："+DateUtil.getPlusTime2(model.getStartTime())+"-"+DateUtil.getPlusTime2(model.getEndTime())+"】";
        //记录删除日志
        UserActionServiceImpl.saveUserActionBiz(user,id,Constants.UserActionType.CAR_BOOK_DEL,userActionMapper,date,params, JSONObject.toJSONString(model));

        VisitsServiceImpl.dealCancelNoticesData(noticesJoinMapper,approveMapper,"系统删除",model.getId(),
                Constants.equalsInteger(model.getType(),Constants.ZERO)?Constants.approveObjectType.cityUseCar:Constants.approveObjectType.unCityUseCar,
                Constants.noticesObjectType.useCar
        );
    }
    @Override
    public void delete(CarUseBook carUseBook) {
@@ -330,7 +337,8 @@
        queryWrapper.select("t4.company_name_path",CarUseBook::getCompanyName);
        queryWrapper.leftJoin(Member.class,Member::getId,CarUseBook::getMemberId)
                    .leftJoin(Member.class,Member::getId,CarUseBook::getDriverId)
                    .leftJoin("company t4 on t1.company_id=t4.id");   //数据权限开始--------------------start----------------
                    .leftJoin("company t4 on t1.company_id=t4.id");
        //数据权限开始--------------------start----------------
        LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
        if(userInfo!=null && userInfo.getCompanyIdList()!=null){
            if( userInfo.getCompanyIdList().size() ==0){