From 50304934a7a677800e94f15b0dd3f3b788a704ef Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: Mon, 24 Jul 2023 09:29:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/gk/hotwork/Mapper/DepartmentInfoMapper.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Mapper/DepartmentInfoMapper.java b/src/main/java/com/gk/hotwork/Mapper/DepartmentInfoMapper.java
index 21cba15..53119d3 100644
--- a/src/main/java/com/gk/hotwork/Mapper/DepartmentInfoMapper.java
+++ b/src/main/java/com/gk/hotwork/Mapper/DepartmentInfoMapper.java
@@ -13,7 +13,7 @@
@Repository
public interface DepartmentInfoMapper extends BaseMapper<DepartmentInfo> {
- List<DepartmentVo> selectDataGrid(Page<DepartmentVo> page, Map<String, Object> condition);
+ List<DepartmentVo> selectDataGrid(@Param("page") Page<DepartmentVo> page,@Param("condition") Map<String, Object> condition);
DepartmentInfo selectExistByName(@Param("id") Long id,@Param("department") String department);
@@ -21,9 +21,9 @@
DepartmentInfo selectSafety(@Param("id") Long id);
- Integer selectCountForExam(Map<String, Object> params);
+ Integer selectCountForExam(@Param("params") Map<String, Object> params);
- List<DepartmentInfo> selectPageForExam(Map<String, Object> params);
+ List<DepartmentInfo> selectPageForExam(@Param("params") Map<String, Object> params);
DepartmentInfo getInfoByName(String departmentName);
--
Gitblit v1.9.2