贸易上传修改权限

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java

@@ -78,8 +78,10 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
     @Override
     public List<TradeuploadEntity> getList(TradeuploadPagination tradeuploadPagination){
         String userId=userProvider.get().getUserId();
-        String detpartment=null;
-         detpartment=userProvider.getDepartmentId(userId);
+        String detpartment = null;
+        if (!userProvider.get().getIsAdministrator()) {
+            detpartment = userProvider.getDepartmentId(userId);
+        }
         List<String> AllIdList =new ArrayList();
         int total=0;
 		int tradeuploadNum =0;
@@ -147,12 +149,15 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
         String department_id = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
                 .map(TradeuploadEntity::getDepartmentId)
                 .orElse(null);
-        if (department_id==null){
-            tradeuploadPagination.setDepartmentId(detpartment);
-        }else {
-            tradeuploadPagination.setDepartmentId(department_id);
+        if (!userProvider.get().getIsAdministrator()) {
+            if (department_id==null){
+                tradeuploadPagination.setDepartmentId(detpartment);
+            }else {
+                tradeuploadPagination.setDepartmentId(department_id);
+            }
         }
 
+
 //        tradeuploadPagination.setDepartmentId(detpartment);
         IPage<TradeuploadEntity> userIPage = tradeuploadMapper.queryByKeyword(page, tradeuploadPagination);
         return tradeuploadPagination.setData(userIPage.getRecords(),userIPage.getTotal());