批量更新

server/controllers/oa.go

@@ -85,6 +85,7 @@ func (c *OAController) GetOABaseData() {
 		roleList = append(roleList, map[string]interface{}{
 			"roleId":      role.RoleId,
 			"tenantId":    role.TenantId,
+			"default":     role.Default,
 			"roleCode":    role.RoleCode,
 			"roleName":    role.RoleName,
 			"description": role.Description,

server/controllers/role.go

@@ -29,6 +29,8 @@ func (c *RoleController) GetAllRoles() {
 	for _, role := range roles {
 		roleList = append(roleList, map[string]interface{}{
 			"roleId":      role.RoleId,
+			"tenantId":    role.TenantId,
+			"default":     role.Default,
 			"roleCode":    role.RoleCode,
 			"roleName":    role.RoleName,
 			"description": role.Description,
@@ -124,10 +126,30 @@ func (c *RoleController) GetRoleByTenantId() {
 		c.ServeJSON()
 		return
 	}
+	
+	// 转换为前端需要的格式，确保包含 tenantId 和 default 字段
+	roleList := make([]map[string]interface{}, 0)
+	for _, role := range roles {
+		roleList = append(roleList, map[string]interface{}{
+			"roleId":      role.RoleId,
+			"tenantId":    role.TenantId,
+			"default":     role.Default,
+			"roleCode":    role.RoleCode,
+			"roleName":    role.RoleName,
+			"description": role.Description,
+			"status":      role.Status,
+			"sortOrder":   role.SortOrder,
+			"createTime":  role.CreateTime,
+			"updateTime":  role.UpdateTime,
+			"createBy":    role.CreateBy,
+			"updateBy":    role.UpdateBy,
+		})
+	}
+	
 	c.Data["json"] = map[string]interface{}{
 		"code":    0,
 		"message": "获取角色列表成功",
-		"data":    roles,
+		"data":    roleList,
 	}
 	c.ServeJSON()
 }