From a0d94a34e2e4d749fdbeb8e5cfe8199f3d75621c Mon Sep 17 00:00:00 2001
From: bawei <95887577@qq.com>
Date: Tue, 28 Mar 2023 18:32:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A3=85=E5=8D=95=E8=AF=86=E5=88=AB=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java | 6 +++---
 .../tradeupload/service/impl/TradeuploadServiceImpl.java    | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java
index cbd41f38..15eabf38 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java
@@ -80,8 +80,8 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
         QueryWrapper<PaymentdocItem1Entity> paymentdocItem1QueryWrapper=new QueryWrapper<>();
         int paymentdocItem2Num =0;
         QueryWrapper<PaymentdocItem2Entity> paymentdocItem2QueryWrapper=new QueryWrapper<>();
-        boolean pcPermission = false;
-        boolean appPermission = false;
+        boolean pcPermission = true;
+        boolean appPermission = true;
         boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
         if(isPc && pcPermission){
             if (!userProvider.get().getIsAdministrator()){
@@ -178,7 +178,7 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
                 declaredField.setAccessible(true);
                 String value = declaredField.getAnnotation(TableField.class).value();
                 paymentdocPagination.setSidx(value);
-//                paymentdocQueryWrapper="asc".equals(paymentdocPagination.getSort().toLowerCase())?paymentdocQueryWrapper.orderByAsc(value):paymentdocQueryWrapper.orderByDesc(value);
+                paymentdocQueryWrapper="asc".equals(paymentdocPagination.getSort().toLowerCase())?paymentdocQueryWrapper.orderByAsc(value):paymentdocQueryWrapper.orderByDesc(value);
             } catch (NoSuchFieldException e) {
                 e.printStackTrace();
             }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java
index a7632c03..1a58aeca 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java
@@ -118,6 +118,10 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
             tradeuploadPagination.setStartDate(new Date(fir));
             tradeuploadPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
         }
+        if(AllIdList.size()>0){
+            tradeuploadQueryWrapper.lambda().in(TradeuploadEntity::getId, AllIdList);
+        }
+        //排序
         if(StringUtil.isEmpty(tradeuploadPagination.getSidx())){
             tradeuploadPagination.setSidx("CREATOR_TIME");
             tradeuploadPagination.setSort("DESC");
@@ -128,7 +132,7 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
                 Field declaredField = tradeuploadEntity.getClass().getDeclaredField(sidx);
                 declaredField.setAccessible(true);
                 String value = declaredField.getAnnotation(TableField.class).value();
-                tradeuploadPagination.setSidx(value);
+                tradeuploadQueryWrapper="asc".equals(tradeuploadPagination.getSort().toLowerCase())?tradeuploadQueryWrapper.orderByAsc(value):tradeuploadQueryWrapper.orderByDesc(value);
             } catch (NoSuchFieldException e) {
                 e.printStackTrace();
             }