From 238485902291aa1aee8e98e47be5947a55e68cf7 Mon Sep 17 00:00:00 2001
From: zhangheng <test@test.test>
Date: Fri, 26 Sep 2025 16:14:15 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E5=88=86=E9=A1=B5=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=80=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/api/ApiMemberStructureController.java   | 10 +++++-----
 .../controller/manage/MemberStructureController.java   |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java
index 93569159..2239b343 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java
@@ -126,15 +126,15 @@ public class ApiMemberStructureController extends BaseController {
 
     @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)
     @GetMapping("/three-framework-list")
-    public TableDataInfo threeFrameworkList(Integer stage, Integer stageStatus) {
+    public AjaxResult threeFrameworkList(Integer stage, Integer stageStatus) {
         if (stage == null) {
             log.error("参数错误");
-            return null;
+            return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
         }
         Long userId = SecurityUtils.getUserId();
         if (userId == null) {
             log.error("用户登录信息错误");
-            return null;
+            return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
         }
         // 获取当前时间 -1 天
         String yesterday  = LocalDate.now().minusDays(1).format((DateTimeFormatter.ofPattern("yyyy-MM-dd")));
@@ -147,13 +147,13 @@ public class ApiMemberStructureController extends BaseController {
         Integer isFind = iCumemberRetailDetailService.getFindCumemberRetailDetail(settleTableName);
         if (isFind == null || isFind != 1) {
             log.error("当前会员日结信息不存在{}",settleTableName);
-            return null;
+            return AjaxResult.error();
         }
         startPage();
         // 查询当前会员所有子点位信息
         CuMember member = iCuMemberService.getMember(userId);
         List<CuMemberThreeFrameworkVO> cuMemberThreeFrameworkVOS = iCumemberRetailDetailService.getCuMemberRetailDetailList(settleTableName,member.getMemberCode(),stage,stageStatus);
-        return getDataTable(cuMemberThreeFrameworkVOS);
+        return AjaxResult.success(getDataTable(cuMemberThreeFrameworkVOS));
     }
 
     @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java
index ab6d1996..2d05140a 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java
@@ -255,10 +255,10 @@ public class MemberStructureController extends BaseController {
      */
     @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)
     @GetMapping("/three-framework-list")
-    public TableDataInfo threeFrameworkList(Long memberSettlePeriodId, String memberCode, Integer stage, Integer stageStatus) {
+    public AjaxResult threeFrameworkList(Long memberSettlePeriodId, String memberCode, Integer stage, Integer stageStatus) {
         if (memberSettlePeriodId == null || memberCode == null ||  stage == null) {
             log.error("参数错误");
-            return null;
+            return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
         }
         CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId);
         log.info("日结信息{}",csPeriod);
@@ -268,12 +268,12 @@ public class MemberStructureController extends BaseController {
         Integer isFind = iCumemberRetailDetailService.getFindCumemberRetailDetail(settleTableName);
         if (isFind == null || isFind != 1) {
             log.error("当前表名不存在{}",settleTableName);
-            return null;
+            return AjaxResult.error();
         }
         startPage();
         // 查询当前会员所有子点位信息
         List<CuMemberThreeFrameworkVO> cuMemberThreeFrameworkVOS = iCumemberRetailDetailService.getCuMemberRetailDetailList(settleTableName,memberCode,stage,stageStatus);
-        return getDataTable(cuMemberThreeFrameworkVOS);
+        return AjaxResult.success(getDataTable(cuMemberThreeFrameworkVOS));
     }
 
     @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)