diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml
index 2a39496d..dd57f034 100644
--- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml
+++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml
@@ -343,7 +343,7 @@
create unique index PK_${tableName}
on ${tableName}
(
- PK_MEMBER, CHILD_NODE
+ PK_MEMBER, CHILD_NODE, STAGE
)
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 }
+
+ and cud.STAGE_STATUS = #{stageStatus}
+