From 85292b84f3ece751e0c55e372e1c74a647ed93f9 Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Thu, 19 Jun 2025 17:07:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/system/mapper/UserMapper.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/system/mapper/UserMapper.java b/oying-system/src/main/java/com/oying/modules/system/mapper/UserMapper.java
index d506a8c..928ffcc 100644
--- a/oying-system/src/main/java/com/oying/modules/system/mapper/UserMapper.java
+++ b/oying-system/src/main/java/com/oying/modules/system/mapper/UserMapper.java
@@ -27,6 +27,8 @@
User findByUsername(@Param("username") String username);
+ User findByOpenid(@Param("openid") String openid);
+
User findByEmail(@Param("email") String email);
User findByPhone(@Param("phone") String phone);
@@ -39,13 +41,9 @@
List<User> findByRoleId(@Param("roleId") Long roleId);
- List<User> findByRoleDeptId(@Param("deptId") Long deptId);
-
List<User> findByMenuId(@Param("menuId") Long menuId);
int countByJobs(@Param("jobIds") Set<Long> jobIds);
-
- int countByDepts(@Param("deptIds") Set<Long> deptIds);
int countByRoles(@Param("roleIds") Set<Long> roleIds);
--
Gitblit v1.9.3