## Fix - H5体系-区域选择
This commit is contained in:
parent
561b61a30b
commit
4ff7004909
|
@ -240,7 +240,7 @@ public class RetailMemberController extends BaseController {
|
||||||
// return AjaxResult.error("当前区域已经被占用");
|
// 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) {
|
if (cuMemberRetailRegion > 0) {
|
||||||
return AjaxResult.error("当前区域已经被占用");
|
return AjaxResult.error("当前区域已经被占用");
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,16 +51,8 @@
|
||||||
LEFT JOIN BD_VERTEX bv ON cm.PK_VERTEX = bv.PK_ID
|
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
|
LEFT JOIN BD_REGION_VERTEX brv ON bv.REGION_VERTEX_PK_ID = brv.PK_ID
|
||||||
where 1=1
|
where 1=1
|
||||||
and cm.pk_id = ${userId}
|
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 cmrr.system_type = #{systemType}
|
|
||||||
)
|
)
|
||||||
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>
|
</select>
|
||||||
|
|
||||||
<!-- 插入收益区域 -->
|
<!-- 插入收益区域 -->
|
||||||
|
|
Loading…
Reference in New Issue