From ed0c016da2b281fc16aecd23342048a03a6a6e4a Mon Sep 17 00:00:00 2001
From: guohb <ghb01699725@alibaba-inc.com>
Date: Fri, 17 May 2024 09:02:21 +0800
Subject: [PATCH] fix

---
 .../src/main/resources/mapper/ApplyLicenseMapper.xml        | 6 +++++-
 .../cool/store/service/impl/ApplyLicenseServiceImpl.java    | 4 ----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml
index 5dfbd83e7..162cc1bc4 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml
@@ -71,7 +71,11 @@
                 AND s.shop_name like concat('%',#{request.storeName},'%')
             </if>
             <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 test="request.regionId != null and request.regionId != ''">
                 AND l.region_id = #{request.regionId}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
index 227db4a56..99e0f9a6a 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
@@ -201,10 +201,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
         //查证照列表数据
         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 = userAuthByMappingIds.stream().map(UserAuthMappingDO::getMappingId).collect(Collectors.toList());
             if (CollectionUtils.isEmpty(regionIds)) {
                 return new PageInfo<>();
             }
@@ -213,7 +210,6 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
             if (CollectionUtils.isEmpty(fightRegion)) {
                 return new PageInfo<>();
             }
-
             PageHelper.startPage(request.getPageNum(), request.getPageSize());
             licenseListResponses = applyLicenseMapper.licenseList(request, null, fightRegionIds);
         } else {