From 64c7668818aa8272c0aae206a3c0f7007ca38e5d Mon Sep 17 00:00:00 2001
From: 艾金辉 <1144154118@qq.com>
Date: 星期六, 22 七月 2023 16:37:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java
index f366718..d5ea855 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java
@@ -1,7 +1,10 @@
package com.ruoyi.sy.mapper;
import java.util.List;
+import java.util.Map;
+
import com.ruoyi.sy.domain.ArdSyCar;
+import org.apache.ibatis.annotations.Param;
/**
* 涓変竴杞﹁締Mapper鎺ュ彛
@@ -67,10 +70,17 @@
*/
public List<ArdSyCar> selectArdSyCarByIds(String[] ids);
+// List<ArdSyCar> getArdSyCarWithRightByCarIdList(@Param("carIdList")List<String> carIdList);
+
/**
* 鏍规嵁杞﹁締ID鏌ヨ杞﹁締鍒楄〃
- * @param carId
+ * @param id
* @return
*/
- List<ArdSyCar> carListById(String carId);
+ List<ArdSyCar> carListById(String id);
+
+ /**
+ * 鏍规嵁杞﹁締id鏌ヨ涓変竴杞﹁締鍙婂搴旈儴闂�
+ */
+ public Map<String, Object> getArdSyCarAndDeptByCarId(String carId);
}
--
Gitblit v1.9.3