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 1a58aeca..a8d9abbd 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
@@ -1,5 +1,6 @@
 package jnpf.tradeupload.service.impl;
 
+import com.tencentcloudapi.ie.v20200304.models.MediaJoiningInfo;
 import jnpf.contractfile.entity.ContractFileEntity;
 import jnpf.contractfile.service.ContractFileService;
 import jnpf.customer.entity.CustomerEntity;
@@ -77,7 +78,8 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
     @Override
     public List<TradeuploadEntity> getList(TradeuploadPagination tradeuploadPagination){
         String userId=userProvider.get().getUserId();
-//        String detpartment=userProvider.getDepartmentId(userId);
+        String detpartment=null;
+         detpartment=userProvider.getDepartmentId(userId);
         List<String> AllIdList =new ArrayList();
         int total=0;
 		int tradeuploadNum =0;
@@ -145,8 +147,11 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
         String department_id = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
                 .map(TradeuploadEntity::getDepartmentId)
                 .orElse(null);
-
-        tradeuploadPagination.setDepartmentId(department_id);
+        if (department_id==null){
+            tradeuploadPagination.setDepartmentId(detpartment);
+        }else {
+            tradeuploadPagination.setDepartmentId(department_id);
+        }
 
 //        tradeuploadPagination.setDepartmentId(detpartment);
         IPage<TradeuploadEntity> userIPage = tradeuploadMapper.queryByKeyword(page, tradeuploadPagination);