Bläddra i källkod

fixed 权限判断问题

fushengqian 1 år sedan
förälder
incheckning
7b403bde2a

+ 1 - 1
fuint-application/src/main/java/com/fuint/common/service/impl/BalanceServiceImpl.java

@@ -108,6 +108,7 @@ public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance>
             lambdaQueryWrapper.eq(MtBalance::getStoreId, storeId);
         }
         lambdaQueryWrapper.orderByDesc(MtBalance::getId);
+        Page<MtBanner> pageHelper = PageHelper.startPage(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         List<MtBalance> balanceList = mtBalanceMapper.selectList(lambdaQueryWrapper);
 
         List<BalanceDto> dataList = new ArrayList<>();
@@ -127,7 +128,6 @@ public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance>
             dataList.add(item);
         }
 
-        Page<MtBanner> pageHelper = PageHelper.startPage(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         PageRequest pageRequest = PageRequest.of(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         PageImpl pageImpl = new PageImpl(dataList, pageRequest, pageHelper.getTotal());
         PaginationResponse<BalanceDto> paginationResponse = new PaginationResponse(pageImpl, BalanceDto.class);

+ 1 - 1
fuint-application/src/main/java/com/fuint/common/service/impl/PointServiceImpl.java

@@ -96,6 +96,7 @@ public class PointServiceImpl extends ServiceImpl<MtPointMapper, MtPoint> implem
         }
 
         lambdaQueryWrapper.orderByDesc(MtPoint::getId);
+        Page<MtPoint> pageHelper = PageHelper.startPage(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         List<MtPoint> pointList = mtPointMapper.selectList(lambdaQueryWrapper);
 
         List<PointDto> dataList = new ArrayList<>();
@@ -114,7 +115,6 @@ public class PointServiceImpl extends ServiceImpl<MtPointMapper, MtPoint> implem
             item.setStatus(point.getStatus());
             dataList.add(item);
         }
-        Page<MtPoint> pageHelper = PageHelper.startPage(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         PageRequest pageRequest = PageRequest.of(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         PageImpl pageImpl = new PageImpl(dataList, pageRequest, pageHelper.getTotal());
         PaginationResponse<PointDto> paginationResponse = new PaginationResponse(pageImpl, PointDto.class);

+ 5 - 1
fuint-repository/src/main/resources/mapper/TSourceMapper.xml

@@ -2,7 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fuint.repository.mapper.TSourceMapper">
     <select id="findSourcesByAccountId" resultType="com.fuint.repository.model.TSource">
-        SELECT s.* FROM `t_source` s WHERE s.status='A' AND (s.merchant_id = 0 OR s.merchant_id = #{merchantId}) AND source_id IN(SELECT source_id FROM `t_duty_source` WHERE duty_id IN(SELECT duty_id FROM `t_account_duty` WHERE acct_id = #{accountId})) ORDER BY s.source_style ASC
+        SELECT s.* FROM `t_source` s WHERE s.status='A'
+        AND (s.merchant_id = 0 OR s.merchant_id = #{merchantId})
+        AND source_id IN(SELECT source_id FROM `t_duty_source` WHERE duty_id IN(SELECT duty_id FROM `t_account_duty` WHERE acct_id = #{accountId}))
+        ORDER BY s.source_style ASC
+        LIMIT 1000
     </select>
 
     <select id="findByIdIn" resultType="com.fuint.repository.model.TSource">