Просмотр исходного кода

fix & chore: 费用统计SQL修正 + 仓库安全加固

- ResourceMapper.xml: costStatByType 去掉 resource_type.deleted 无效关联条件(该字典表无deleted列),修复『系统繁忙』500
- .gitignore: 排除含明文凭据的 application-dev/prod.yml 与 .env,避免密钥入库
C 2 месяцев назад
Родитель
Сommit
6605ea85f1
2 измененных файлов с 9 добавлено и 1 удалено
  1. 8 0
      .gitignore
  2. 1 1
      backend/src/main/resources/mapper/ResourceMapper.xml

+ 8 - 0
.gitignore

@@ -20,3 +20,11 @@ desktop.ini
 
 # Logs
 *.log
+
+# 含明文凭据的本地配置,禁止提交
+backend/src/main/resources/application-dev.yml
+backend/src/main/resources/application-prod.yml
+.env
+.env.*
+!.env.example
+application-*.local.yml

+ 1 - 1
backend/src/main/resources/mapper/ResourceMapper.xml

@@ -20,7 +20,7 @@
                COUNT(r.id)                AS resource_count,
                IFNULL(SUM(r.cost), 0)    AS total_cost
         FROM resource r
-                 LEFT JOIN resource_type rt ON rt.id = r.type_id AND rt.deleted = 0
+                 LEFT JOIN resource_type rt ON rt.id = r.type_id
         WHERE r.deleted = 0
         GROUP BY r.type_id, rt.name
         ORDER BY total_cost DESC