suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
guohb
2024-05-17 09:02:21 +08:00
parent d919177184
commit ed0c016da2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml
View File

@@ -71,7 +71,11 @@
AND s.shop_name like concat('%',#{request.storeName},'%') AND s.shop_name like concat('%',#{request.storeName},'%')
</if> </if>
<if test="request.submitStartTime != null and request.submitEndTime"> <if test="request.submitStartTime != null and request.submitEndTime">
AND o.create_time BETWEEN #{request.submitStartTime} AND #{request.submitEndTime} AND
o.create_time BETWEEN
FROM_UNIXTIME(#{request.submitStartTime} / 1000)
AND FROM_UNIXTIME(#{request.submitEndTime} / 1000)
</if> </if>
<if test="request.regionId != null and request.regionId != ''"> <if test="request.regionId != null and request.regionId != ''">
AND l.region_id = #{request.regionId} AND l.region_id = #{request.regionId}

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
View File

@@ -201,10 +201,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
//查证照列表数据 //查证照列表数据
if (userRoleIds.contains(UserRoleEnum.THEATER_MANAGER.getCode())) { if (userRoleIds.contains(UserRoleEnum.THEATER_MANAGER.getCode())) {
//当前用户所属区域 //当前用户所属区域
// List<UserRegionMappingDO> regionIdsByUserIds = userRegionMappingMapper.getRegionIdsByUserIds(Collections.singletonList(user.getUserId()));
// List<UserAuthMappingDO> userAuthByMappingIds =
List<String> regionIds = userAuthMappingMapper.getMappingIdsByUserId(user.getUserId()); List<String> regionIds = userAuthMappingMapper.getMappingIdsByUserId(user.getUserId());
// List<String> regionIds = userAuthByMappingIds.stream().map(UserAuthMappingDO::getMappingId).collect(Collectors.toList());
if (CollectionUtils.isEmpty(regionIds)) { if (CollectionUtils.isEmpty(regionIds)) {
return new PageInfo<>(); return new PageInfo<>();
} }
@@ -213,7 +210,6 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
if (CollectionUtils.isEmpty(fightRegion)) { if (CollectionUtils.isEmpty(fightRegion)) {
return new PageInfo<>(); return new PageInfo<>();
} }
PageHelper.startPage(request.getPageNum(), request.getPageSize()); PageHelper.startPage(request.getPageNum(), request.getPageSize());
licenseListResponses = applyLicenseMapper.licenseList(request, null, fightRegionIds); licenseListResponses = applyLicenseMapper.licenseList(request, null, fightRegionIds);
} else { } else {