diff --git a/core/db/methods/user_hierarchy.go b/core/db/methods/user_hierarchy.go index 9e3aab7..b6b696f 100644 --- a/core/db/methods/user_hierarchy.go +++ b/core/db/methods/user_hierarchy.go @@ -199,73 +199,6 @@ func (u *UserHierarchyDB) GetApproversDB( system = systems[0] } - logrus.Infof("🔍 GetApproversDB START: subordinateID=%d, departmentID=%d, topicID=%d, categoryID=%d, system='%s'", - subordinateID, departmentID, topicID, categoryID, system) - - // ========================================== - // 🐛 БЛОК ОТЛАДОЧНОГО ЛОГИРОВАНИЯ (DEBUG) - // ========================================== - debugSQL := ` - WITH target_topic AS ( - SELECT code, category_id FROM approval_topics WHERE id = $3 - ), - matching_topics AS ( - SELECT t.id, t.code, LENGTH(t.code) as spec_score - FROM approval_topics t - CROSS JOIN target_topic tt - WHERE strpos(tt.code || '_', t.code || '_') = 1 - AND t.category_id = tt.category_id - ), - ranked AS ( - SELECT - uh.id as hierarchy_id, - uh.approver_id, - uh.priority, - mt.code as matched_code, - CASE - WHEN mt.id IS NOT NULL THEN 1000 - mt.spec_score - WHEN uh.topic_category_id = $4 AND uh.topic_id IS NULL THEN 2000 - WHEN uh.topic_id IS NULL AND uh.topic_category_id IS NULL THEN 3000 - END AS specificity - FROM user_hierarchy uh - LEFT JOIN matching_topics mt ON uh.topic_id = mt.id - WHERE uh.subordinate_id = $1 - AND uh.department_id = $2 - AND ( - mt.id IS NOT NULL - OR (uh.topic_category_id = $4 AND uh.topic_id IS NULL) - OR (uh.topic_id IS NULL AND uh.topic_category_id IS NULL) - ) - ) - SELECT hierarchy_id, approver_id, priority, COALESCE(matched_code, 'CATEGORY_OR_GLOBAL'), specificity - FROM ranked - ORDER BY specificity ASC, priority ASC - ` - dRows, dErr := u.pool.Query(ctx, debugSQL, subordinateID, departmentID, topicID, categoryID) - if dErr == nil { - logrus.Infof(" 📊 [DEBUG] Список найденных правил для пользователя:") - foundRules := false - for dRows.Next() { - var hID, apprID uint64 - var prio, spec int - var mCode string - if err := dRows.Scan(&hID, &apprID, &prio, &mCode, &spec); err == nil { - foundRules = true - logrus.Infof(" ---> Правило ID=%d | Согласующий=%d | Priority=%d | Совпадение='%s' | SCORE=%d (меньше=важнее)", - hID, apprID, prio, mCode, spec) - } - } - dRows.Close() - if !foundRules { - logrus.Infof(" ---> ⚠️ Для связки subordinateID=%d и departmentID=%d не найдено ни одного правила!", subordinateID, departmentID) - } - } else { - logrus.Warnf(" ❌ [DEBUG] Ошибка при выполнении отладочного запроса: %v", dErr) - } - // ========================================== - // КОНЕЦ БЛОКА ОТЛАДКИ - // ========================================== - rawSQL := ` WITH target_topic AS ( SELECT code, category_id FROM approval_topics WHERE id = $3