磅单识别修改权限

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();
             }

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();
             }