fix-permissions #66

Merged
romanskijdev merged 2 commits from fix-permissions into main 2026-07-14 12:39:27 +03:00
4 changed files with 38 additions and 30 deletions

View File

@ -548,13 +548,16 @@ func buildApprovalIdSubquery(role string, userID *uint64) squirrel.SelectBuilder
case "observer":
return q.
Join(dbcoretablenames.TableNameApprovalTopics.ToString() + " t ON t.id = a.topic_id").
Join(dbcoretablenames.TableNameApprovalTopicCategories.ToString() + " c ON c.id = t.category_id").
Join(dbcoretablenames.TableNamePermissions.ToString() + " p ON p.topic_category_id = c.id").
Join("user_roles ur ON ur.role_id = p.role_id").
Where(squirrel.And{
squirrel.Eq{"ur.user_id": userID},
squirrel.Eq{"p.action": "observe"},
Join(dbcoretablenames.TableNameApprovalTopics.ToString()+" t ON t.id = a.topic_id").
Join(dbcoretablenames.TableNameApprovalTopicCategories.ToString()+" c ON c.id = t.category_id").
Join(dbcoretablenames.TableNamePermissions.ToString()+" p ON p.role_id IN (SELECT ur.role_id FROM user_roles ur WHERE ur.user_id = ?)", userID).
Where(squirrel.Eq{"p.action": "observe"}).
Where(squirrel.Or{
squirrel.And{
squirrel.Expr("p.topic_id IS NULL"),
squirrel.Expr("p.topic_category_id = c.id"),
},
squirrel.Expr("p.topic_id = t.id"),
})
default:

View File

@ -23,29 +23,30 @@ func BuildExcelApprovalsReport(ctx context.Context, db *database.ModuleDB, appro
}
headers := []string{
"ФИО инициатора", // A
"Тема согласования", // B
"Дата создания", // C
"Согласующие", // D
"Наблюдатели", // E
"Статус", // F
"Текст согласования", // G
"Отдел сотрудника", // H
"Комментарии", // I
"Дата согласования", // J
"Текст задачи", // K
"Исполнитель", // L
"Статус задачи", // M
"Дата исполнения", // N
"ID", // A 🆕
"ФИО инициатора", // B
"Тема согласования", // C
"Дата создания", // D
"Согласующие", // E
"Наблюдатели", // F
"Статус", // G
"Текст согласования", // H
"Отдел сотрудника", // I
"Комментарии", // J
"Дата согласования", // K
"Текст задачи", // L
"Исполнитель", // M
"Статус задачи", // N
"Дата исполнения", // O
}
cols := []string{"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N"}
cols := []string{"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O"}
colWidths := map[string]float64{
"A": 25, "B": 40, "C": 18, "D": 30,
"E": 30, "F": 16, "G": 40, "H": 25,
"I": 30, "J": 18, "K": 40, "L": 25,
"M": 18, "N": 18,
"A": 10, "B": 25, "C": 40, "D": 18, "E": 30,
"F": 30, "G": 16, "H": 40, "I": 25,
"J": 30, "K": 18, "L": 40, "M": 25,
"N": 18, "O": 18,
}
headerStyle, err := f.NewStyle(&excelize.Style{
@ -126,6 +127,11 @@ func BuildExcelApprovalsReport(ctx context.Context, db *database.ModuleDB, appro
for rowIdx, a := range approvals {
row := rowIdx + 2
approvalID := uint64(0)
if a.ID != nil {
approvalID = *a.ID
}
// === ФИО инициатора ===
initiatorName := ""
if a.Initiator != nil && a.Initiator.FullName != nil {
@ -361,6 +367,7 @@ func BuildExcelApprovalsReport(ctx context.Context, db *database.ModuleDB, appro
}
values := []interface{}{
approvalID,
initiatorName, topicName, createdAt,
approversCell, observersCell,
status, content, deptName, comment,
@ -384,7 +391,7 @@ func BuildExcelApprovalsReport(ctx context.Context, db *database.ModuleDB, appro
}
cellStyle := style
if hasTaskError && colIdx >= 10 && colIdx <= 12 {
if hasTaskError && colIdx >= 11 && colIdx <= 13 {
cellStyle = errorStyle
}
if err := f.SetCellStyle(sheet, cell, cell, cellStyle); err != nil {

View File

@ -580,7 +580,7 @@ func (h *Handler) handleDecision(
// ==========================================
// Запрос обязательного комментария для первого шага
if requireComment && comment == "" {
if requireComment && comment == "" && !isAdditionalApprover {
activeStep, _ := h.ipc.Database.ApprovalStep.GetActiveStepDB(ctx, approvalID)
if activeStep != nil && activeStep.StepOrder != nil && *activeStep.StepOrder == 0 {
commentKey := fmt.Sprintf("appr_approve_comment_pending:%d", telegramID)

View File

@ -34,8 +34,6 @@ func (dr *DailyReminder) scheduleLoop() {
mskLocation = time.FixedZone("MSK", 3*3600) // Fallback: UTC+3
}
dr.sendReminders()
for {
now := time.Now().In(mskLocation)