Merge remote-tracking branch 'origin/main' into multi-tenant

This commit is contained in:
TsMask
2024-07-06 15:50:46 +08:00
15 changed files with 121 additions and 98 deletions

View File

@@ -282,7 +282,7 @@ func (r *SysUserImpl) SelectAllocatedPage(query map[string]any, dataScopeSQL str
}
// 构建查询条件语句
whereSql := " where u.del_flag = '0' "
whereSql := " where u.del_flag = '0' and u.user_id != '1' "
if len(conditions) > 0 {
whereSql += " and " + strings.Join(conditions, " and ")
}