From 6860d3359b3e8cd1d9731f1fd626812047e7ba31 Mon Sep 17 00:00:00 2001
From: zhangheng <test@test.test>
Date: Mon, 22 Sep 2025 16:38:44 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E4=B8=89=E9=98=B6=E6=AE=B5=E6=9E=B6?=
 =?UTF-8?q?=E6=9E=84,=E5=AD=90=E4=BC=9A=E5=91=98=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=98=B6=E6=AE=B5=E7=8A=B6=E6=80=81=E5=8F=AF?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/manage/MemberStructureController.java      | 4 ++--
 .../mapper/retail/member/CuMemberRetailDetailMapper.xml   | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

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 bd3db03d..f7d1205f 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
@@ -219,7 +219,7 @@ public class MemberStructureController extends BaseController {
     @Log(module = EOperationModule.MEMBER_RETAIL_TREE, business = EOperationBusiness.MEMBER_RETAIL_TREE, method = EOperationMethod.SELECT)
     @GetMapping("/three-framework")
     public AjaxResult Framework(Long memberSettlePeriodId, String memberCode,Integer stage,String childNode,Integer stageStatus) {
-        if (memberSettlePeriodId == null || memberCode == null ||  stage == null || stageStatus == null || childNode == null) {
+        if (memberSettlePeriodId == null || memberCode == null ||  stage == null || childNode == null) {
             log.error("参数错误");
             return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
         }
@@ -251,7 +251,7 @@ public class MemberStructureController extends BaseController {
     @Log(module = EOperationModule.MEMBER_RETAIL_CHILDNODE, business = EOperationBusiness.MEMBER_RETAIL_CHILDNODE, method = EOperationMethod.SELECT)
     @GetMapping("/childList")
     public AjaxResult Framework(Long memberSettlePeriodId, String memberCode,Integer stage,Integer stageStatus) {
-        if (memberSettlePeriodId == null || memberCode == null ||  stage == null || stageStatus == null) {
+        if (memberSettlePeriodId == null || memberCode == null ||  stage == null) {
             log.error("参数错误");
             return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
         }
diff --git a/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml
index 08dff19e..a9e7abdd 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml
@@ -11,7 +11,9 @@
         WHERE
           cu.MEMBER_CODE = #{ memberCode }
           AND cud.STAGE = #{ stage }
-          AND cud.STAGE_STATUS = #{ stageStatus }
+        <if test="stageStatus != null">
+            and cud.STAGE_STATUS = #{stageStatus}
+        </if>
     </select>
 
     <select id="getFindCumemberRetailDetail" resultType="java.lang.Integer">
@@ -29,7 +31,9 @@
         WHERE
             cu.MEMBER_CODE = #{ memberCode }
           AND STAGE = #{stage}
-          AND STAGE_STATUS = #{stageStatus}
+          <if test="stageStatus != null">
+              and cud.STAGE_STATUS = #{stageStatus}
+          </if>
           AND CHILD_NODE = #{childNode}
     </select>
 </mapper>