Merge branch 'dev' into test

This commit is contained in:
lzx
2026-01-09 17:47:18 +08:00

View File

@@ -59,7 +59,7 @@ public interface UserDeptMapper extends BaseMapperX<UserDeptDO> {
@Select("<script>" +
"SELECT ud.* FROM system_user_dept ud " +
"INNER JOIN system_users u ON ud.user_id = u.id " +
"WHERE u.user_source = 2 " +
"WHERE u.user_source = 3 " +
"AND ud.deleted = 0 " +
"<if test='tenantId != null'> AND ud.tenant_id = #{tenantId} </if>" +
"<if test='cursorTime != null'>" +
@@ -75,14 +75,14 @@ public interface UserDeptMapper extends BaseMapperX<UserDeptDO> {
@Param("limit") Integer limit);
/**
* 统计用户-部门关系数量(只统计 userSource = 2 的用户)
* 统计用户-部门关系数量(只统计 userSource = 3 的用户)
* @param tenantId 租户ID可选
* @return 数量
*/
@Select("<script>" +
"SELECT COUNT(*) FROM system_user_dept ud " +
"INNER JOIN system_users u ON ud.user_id = u.id " +
"WHERE u.user_source = 2 " +
"WHERE u.user_source = 3 " +
"AND ud.deleted = 0 " +
"<if test='tenantId != null'> AND ud.tenant_id = #{tenantId} </if>" +
"</script>")