获取原始数据、沉降强制参数account_id

app/api/comprehensive_data.py

@@ -353,19 +353,26 @@ def get_settlement(request: SettlementDataQueryRequest, db: Session = Depends(ge
             logger.info(f"Found {result['total']} settlement records using optimized batch query, returning {len(result['data'])} records")
 
         else:
-            # 原逻辑：不提供account_id，按原有方式查询
-            logger.info("Using original query logic without account_id")
-            result = settlement_service.search_settlement_data_formatted(
-                db,
-                id=request.id,
-                point_id=request.point_id,
-                nyid=request.NYID,
-                sjName=request.sjName,
-                workinfoname=request.workinfoname,
-                skip=request.skip,
-                limit=request.limit
+            return DataResponse(
+                code=ResponseCode.SUCCESS,
+                message="未提供account_id，请提供account_id",
+                total=0,
+                data=[]
             )
-            logger.info(f"Found {result['total']} settlement records using original logic, returning {len(result['data'])} records")
+            # 强制 account_id 查询
+            # 原逻辑：不提供account_id，按原有方式查询
+            # logger.info("Using original query logic without account_id")
+            # result = settlement_service.search_settlement_data_formatted(
+            #     db,
+            #     id=request.id,
+            #     point_id=request.point_id,
+            #     nyid=request.NYID,
+            #     sjName=request.sjName,
+            #     workinfoname=request.workinfoname,
+            #     skip=request.skip,
+            #     limit=request.limit
+            # )
+            # logger.info(f"Found {result['total']} settlement records using original logic, returning {len(result['data'])} records")
 
         return DataResponse(
             code=ResponseCode.SUCCESS,
@@ -423,7 +430,7 @@ def get_original(request: OriginalDataQueryRequest, db: Session = Depends(get_db
         logger.info(f"Querying original data with params: {request.dict()}")
         result = comprehensive_service.get_level_and_original_data(
             db,
-            account_id=request.account_id,  # 可选
+            account_id=request.account_id,  # 必选
             id=request.id,
             bfpcode=request.bfpcode,
             bffb=request.bffb,
@@ -505,7 +512,7 @@ def get_settlement_by_nyid(
             total=0,
             data=[]
         )
-    
+
 @router.post("/get_settlement_by_point", response_model=DataResponse)
 def get_settlement_by_point(
     request: NYIDRequest,  # 假设定义了接收nyid的请求模型