From 39500edd05aced7a2d9debba5a243b756dd2a939 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 22 十月 2024 09:13:37 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
index 5c44198..1ba80f2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
@@ -250,7 +250,18 @@
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");
+ .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){
+ //鍙兘鐪嬭嚜宸�
+ queryWrapper.eq(CarUseBook::getCreator,userInfo.getId());
+ }else{
+ queryWrapper.in("t1.company_id" ,userInfo.getCompanyIdList());
+ }
+ }
+ //鏁版嵁鏉冮檺寮�濮�--------------------end----------------
+
queryWrapper
.eq(pageWrap.getModel().getId() != null, CarUseBook::getId, pageWrap.getModel().getId())
.eq(pageWrap.getModel().getCreator() != null, CarUseBook::getCreator, pageWrap.getModel().getCreator())
--
Gitblit v1.9.3