This commit is contained in:
shuo.wang
2025-04-12 20:20:36 +08:00
parent 8f15b46ab4
commit c8fa77699d
2 changed files with 18 additions and 15 deletions

View File

@@ -222,11 +222,13 @@
xsi.deleted = 0
and xssi.shop_stage = 3
and xssi.shop_sub_stage_status != -100
and
xsi.region_id in
<foreach collection="list" open="(" separator="," close=")" index="index" item="item">
#{item}
</foreach>
<if test="list !=null and list.size >0">
and
xsi.region_id in
<foreach collection="list" open="(" separator="," close=")" index="index" item="item">
#{item}
</foreach>
</if>
<if test="request.shopKeyword != null and request.shopKeyword != ''">
and (xsi.shop_name like concat("%",#{request.shopKeyword},"%") or xsi.shop_code like
concat("%",#{request.shopKeyword},"%"))

View File

@@ -17,11 +17,8 @@ import com.cool.store.request.PlatformBuildRequest;
import com.cool.store.request.platformBuildListRequest;
import com.cool.store.response.PlatformBuildListResponse;
import com.cool.store.response.PlatformBuildResponse;
import com.cool.store.service.OperationLogService;
import com.cool.store.service.PlatformBuildService;
import com.cool.store.service.*;
import com.cool.store.mapper.PlatformBuildMapper;
import com.cool.store.service.RegionService;
import com.cool.store.service.UserAuthMappingService;
import com.cool.store.utils.poi.DateUtils;
import com.cool.store.utils.poi.StringUtils;
import com.cool.store.vo.PartnerUserInfoVO;
@@ -52,6 +49,8 @@ import static com.cool.store.enums.point.ShopSubStageStatusEnum.*;
@Service
public class PlatformBuildServiceImpl implements PlatformBuildService {
@Resource
private SysRoleService sysRoleService;
@Resource
private ApplyLicenseMapper applyLicenseMapper;
@Resource
@@ -280,13 +279,15 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
@Override
public PageInfo<PlatformBuildListResponse> platformBuildList(platformBuildListRequest request) {
String userId = request.getOperateUserId();
List<String> regionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(userId);
if (CollectionUtils.isEmpty(regionIds)) {
return new PageInfo<>();
}
List<Long> regionIdList = new ArrayList<>();
for (String regionId : regionIds) {
regionIdList.add(Long.parseLong(regionId));
if (!sysRoleService.checkIsAdmin(userId)){
List<String> regionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(userId);
if (CollectionUtils.isEmpty(regionIds)) {
return new PageInfo<>();
}
for (String regionId : regionIds) {
regionIdList.add(Long.parseLong(regionId));
}
}
List<Long> subRegionIdsByRegionIdList = regionMapper.getSubRegionIdsByRegionIdList(request.getRegionIds());
if (CollectionUtils.isNotEmpty(subRegionIdsByRegionIdList)) {