From 9619965a7a9cd4b8c9f41ef8d5d8aa44d62436c6 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期一, 08 七月 2024 17:39:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_dept' into dev_dept
---
src/main/java/com/mindskip/xzs/repository/DepartmentMapper.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/repository/DepartmentMapper.java b/src/main/java/com/mindskip/xzs/repository/DepartmentMapper.java
index b951949..b995bb3 100644
--- a/src/main/java/com/mindskip/xzs/repository/DepartmentMapper.java
+++ b/src/main/java/com/mindskip/xzs/repository/DepartmentMapper.java
@@ -1,8 +1,10 @@
package com.mindskip.xzs.repository;
import com.mindskip.xzs.domain.Department;
+import com.mindskip.xzs.domain.vo.CascaderDataVO;
import com.mindskip.xzs.viewmodel.admin.department.DepartmentResponseVM;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -13,7 +15,7 @@
Integer update(Department department);
- List<Department> gets();
+ List<Department> gets(List<Integer> deptId);
List<DepartmentResponseVM> page(DepartmentResponseVM departmentResponseVM);
@@ -21,5 +23,20 @@
Department getById(Integer id);
- List<Integer> selectByAdminId(Integer id);
+ Integer selectByAdminId(@Param("userId") Integer userId);
+
+ /**
+ * 鏌ヨ闄や簡id杩欎釜鍗曚綅锛岃鐢ㄦ埛杩樻槸鍑犱釜鍗曚綅鐨勮礋璐ｄ汉
+ * @param userId
+ * @param id
+ * @return
+ */
+ Integer countByAdminId(@Param("userId") Integer userId, @Param("id") Integer id);
+
+ /**
+ * 鎵�鏈夐儴闂�
+ *
+ * @return
+ */
+ List<CascaderDataVO> list();
}
--
Gitblit v1.8.0