From 2674ab29a8b081c362671da55f10be29f37c9634 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 13 三月 2023 18:10:15 +0800
Subject: [PATCH] 财务管理
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
index 8396d4b..fba7e3b 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.modular.system.controller.resp.TOrderResp;
import com.stylefeng.guns.modular.system.dao.TAppUserMapper;
@@ -54,7 +55,9 @@
startTime = split[0];
endTime = split[1];
}
- return tOrderMapper.getOrderList(startTime,endTime,code,source,userName,userPhone,state,driverName,isException);
+ Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
+ Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
+ return tOrderMapper.getOrderList(startTime,endTime,code,source,userName,userPhone,state,driverName,isException,roleType,objectId);
}
@Override
@@ -94,6 +97,7 @@
// 查询司机
TDriver tDriver = tDriverMapper.selectById(tOrder.getDriverId());
model.addAttribute("driverName",tDriver.getName());
+ model.addAttribute("driverPhone",tDriver.getPhone());
// 查询司机所属分公司
TBranchOffice tBranchOffice = tBranchOfficeMapper.selectById(tDriver.getBranchOfficeId());
--
Gitblit v1.7.1