zgty/zt-dsc
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into test

Browse Source
This commit is contained in:
lzx
2026-01-09 17:47:18 +08:00
parent caca8590c7 75e212511d
commit d56587b8fd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/dal/mysql/userdept/UserDeptMapper.java
View File

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