风险防控-巡查人员列表更新。

routers/api/riskManagement/user.py

@@ -43,12 +43,12 @@ async def get_inspection_user_list(
 
         if deptId:
             user_ids = [i.user_id for i in dept_id_get_user_info(db,deptId)]
-            query = query.filter(SysUser.user_id._in(user_ids))
+            query = query.filter(SysUser.user_id.in_(user_ids))
         user_ids = [i.user_id for i in query.all()]
         # 构建查询
         query = db.query(RiskManagementInspectionUser)
         query = query.filter(RiskManagementInspectionUser.del_flag != '2')
-        query = query.filter(RiskManagementInspectionUser.user_id._in(user_ids))
+        query = query.filter(RiskManagementInspectionUser.user_id.in_(user_ids))
 
         # 计算总条目数
         total_items = query.count()
@@ -64,9 +64,11 @@ async def get_inspection_user_list(
         for user in InspectionUsers:
             user_info = user_id_get_user_info(db,user.user_id)
             dept = dept_id_get_dept_info(db,user_info.dept_id)
+            print(dept)
             ancestors_names = dept_id_get_ancestors_names(db,dept)
             area_code = user.area_code
-            area = area_code_get_ancestors_names(db,area_code_get_area_info(db,area_code))
+            area = area_code_get_area_info(db,area_code)
+            area = area_code_get_ancestors_names(db,area)
             user_info = {
                 "id": user.id,
                 "user_id": user.user_id,
@@ -255,7 +257,7 @@ async def delete_inspection_users(
         # 提取请求数据
         query = db.query(RiskManagementInspectionUser)
         query = query.filter(RiskManagementInspectionUser.del_flag != '2')
-        query = query.filter(RiskManagementInspectionUser.id.in_(userIds))
+        query = query.filter(RiskManagementInspectionUser.user_id.in_(userIds))
         users = query.all()
         if not users:
             detail = "用户不存在"

utils/riskManagement_uitl.py

@@ -1,11 +1,14 @@
 from models import *
 
 def area_code_get_ancestors_names(db,area_info, ancestors_name=''):
-    ancestors_name = area_info.area_name + ancestors_name
-    if area_info.parent_id == 0:
+    print(area_info)
+    if area_info is None:
+        print(ancestors_name)
         return ancestors_name
+
     else:
-        return area_code_get_ancestors_names(area_code_get_area_info(db,area_info.parent_id), ancestors_name)
+        ancestors_name = area_info.area_name + ancestors_name
+        return area_code_get_ancestors_names(db,area_code_get_area_info(db,area_info.parent_code), ancestors_name)
 
 def area_code_get_area_info(db,area_code):
     # 机构id获取机构信息

utils/ry_system_util.py

@@ -114,8 +114,9 @@ def role_id_get_role_depts(db,role_id):
 
 
 def dept_id_get_ancestors_names(db,dept, ancestors_name=''):
+    # print(dept)
     ancestors_name = '/' + dept.dept_name + ancestors_name
     if dept.parent_id == 0:
         return ancestors_name
     else:
-        return dept_id_get_ancestors_names(dept_id_get_dept_info(db,dept.parent_id), ancestors_name)
+        return dept_id_get_ancestors_names(db,dept_id_get_dept_info(db,dept.parent_id), ancestors_name)