Merge remote-tracking branch 'origin/dev' into dev

bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java

@@ -240,7 +240,7 @@ public class RetailMemberController extends BaseController {
 //                return AjaxResult.error("当前区域已经被占用");
 //            }
 //        }
-        int cuMemberRetailRegion = iCuMemberRetailRegionService.validateBindCount(param, EYesNo.YES.getIntValue(), SecurityUtils.getSystemType(), param.getPkMember());
+        int cuMemberRetailRegion = iCuMemberRetailRegionService.validateBindCount(param, EYesNo.YES.getIntValue(), SecurityUtils.getSystemType(), userId);
         if (cuMemberRetailRegion > 0) {
             return AjaxResult.error("当前区域已经被占用");
         }

bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailRegionMapper.xml

@@ -51,16 +51,8 @@
                     LEFT JOIN BD_VERTEX bv ON cm.PK_VERTEX = bv.PK_ID
                     LEFT JOIN BD_REGION_VERTEX brv ON bv.REGION_VERTEX_PK_ID = brv.PK_ID
             where 1=1
-              and cm.pk_id = ${userId}
-              and cmrr.system_type = #{systemType}
+              AND cmrr.PK_MEMBER IN (select pk_id from CU_MEMBER where PK_VERTEX in (select pk_id from BD_VERTEX where REGION_VERTEX_PK_ID in (select REGION_VERTEX_PK_ID from BD_VERTEX where pk_id in (select PK_VERTEX FROM cu_member WHERE PK_ID = #{userId} )) and DEL_FLAG = 0))
           )
-          and ba.pk_id not in (select cmrr.county
-                               from cu_member_retail_region cmrr
-                               where cmrr.del_flag = 0
-                                 and cmrr.pk_country = 1
-                                 and cmrr.effective = 0
-                                 and cmrr.system_type = #{systemType}
-        )
     </select>
 
     <!-- 插入收益区域 -->