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

src/modules/system/controller/sys_profile.go

@@ -60,7 +60,7 @@ func (s *SysProfileController) Info(c *gin.Context) {
 	}
 	isAdmin := config.IsAdmin(loginUser.UserID)
 	if isAdmin {
-		roleGroup = append(roleGroup, i18n.TKey(language, "role.admin"))
+		roleGroup = append(roleGroup, i18n.TKey(language, "role.system"))
 	}
 
 	// 查询用户所属岗位组

src/modules/system/repository/sys_user.impl.go

@@ -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 ")
 	}