Merge remote-tracking branch 'origin/main'

Config/word_data_temp.json

@@ -39,7 +39,8 @@
     "远东国际筹备组": "",
     "浙江分公司": "",
     "湖南子公司": "",
-    "鼎信团队": ""
+    "鼎信团队": "",
+    "四川远东": ""
   },
   "监管和同业动态": {
     "监管动态": "",

Router/DailyRouter.py

@@ -189,18 +189,10 @@ def daily_export_to_pdf(req: DailySchemas.DailyExportToPdfReq, db: Session = Dep
 
     with open(os.getcwd() + "\\Config\\word_data_temp.json", encoding='utf-8') as f:
         temp = json.load(f)
-    董监高部门id = [item.id for item in db.query(Department).filter(Department.type == '董监高')]
-    领导列表 = db.query(User).filter(or_(*[func.find_in_set(str(d_id), User.department) for d_id in
-                                           董监高部门id]))
-    conf = {
-        "监管和同业动态": {
-            "监管动态": "",
-            "同业动态": ""
-        },
-        "行业信息专题分析": {
-            "行业信息专题分析": ""
-        },
-        '领导动态': [item.name for item in 领导列表],
+    department_id = [item.id for item in db.query(Department).filter(Department.type == '董监高')]
+    leaders = db.query(User).filter(or_(*[func.find_in_set(str(d_id), User.department) for d_id in department_id]))
+    config = {
+        '领导动态': [item.name for item in leaders],
         '部门分类': get_department_config(db)
     }