From 9ca0dc6e7833715b875cc9b6b91d5c497b2bae8b Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期三, 30 八月 2023 09:05:45 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem into zf
---
src/main/java/com/gk/hotwork/Mapper/UserInfoMapper.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Mapper/UserInfoMapper.java b/src/main/java/com/gk/hotwork/Mapper/UserInfoMapper.java
index 6dfc7c6..545c95e 100644
--- a/src/main/java/com/gk/hotwork/Mapper/UserInfoMapper.java
+++ b/src/main/java/com/gk/hotwork/Mapper/UserInfoMapper.java
@@ -20,9 +20,9 @@
UserInfo selectByPrimaryKey(Long id);
- List<UserVo> selectUserDataGrid(Page<UserVo> page, Map<String, Object> record);
- List<UserVo> selectCompanyUserDataList(Page<UserVo> page, Map<String, Object> record);
- List<UserVo> selectSuperviseUserDataList(Page<UserVo> page, Map<String, Object> record);
+ List<UserVo> selectUserDataGrid(@Param("page") Page<UserVo> page,@Param("record") Map<String, Object> record);
+ List<UserVo> selectCompanyUserDataList(@Param("page") Page<UserVo> page,@Param("record") Map<String, Object> record);
+ List<UserVo> selectSuperviseUserDataList(@Param("page") Page<UserVo> page,@Param("record") Map<String, Object> record);
List<UserInfo> selectUserInfo(@Param("id") Long id, @Param("username") String username);
@@ -42,7 +42,7 @@
List<UserInfo> selectPageForExam(Map<Object, Object> params);
- UserInfo getByRealName(String realname, String depName);
+ UserInfo getByRealName(@Param("realname") String realname,@Param("depName") String depName);
AccountUserVo getAccountByDepartment(@Param("department") String department);
@@ -62,7 +62,9 @@
UserInfo getByUserId(Long userId);
- List<UserVo> selectExpertUserDataList(Page<UserVo> page, Map<String, Object> record);
+ List<UserVo> selectExpertUserDataList(@Param("page") Page<UserVo> page,@Param("record") Map<String, Object> record);
List<UserInfo> selectExpertList(String realname);
+
+ UserVo selectUserVoById(Long userId);
}
--
Gitblit v1.9.2