diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
index b4578bde..43bbcca7 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
@@ -615,16 +615,78 @@ public class TmTaskServiceImpl implements TmTaskService {
     public List<TmTask> getLeaseAuditManageList(TmTask record) {
         Set<String> roles = SecurityUtils.getLoginUser().getRoles();
         Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
-        List<LeaseApplyInfo> collect;
-        int count = 0;
-        List<LeaseApplyInfo> leaseApplyInfoList = new ArrayList<>();
+        List<TmTask> list = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
+        record.setDeptId(deptId);
+
         List<TmTask> tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
-        if (roles.contains("admin")) {
-            for (TmTask tmTask : tmTaskList) {
-                if (tmTask != null) {
-                    // 去查询任务分单表
-                    collect = tmTaskMapper.getAuditManageListByLeaseInfo(tmTask);
-                    record.setDeptId(null);
+
+        for (TmTask tmTask : tmTaskList) {
+            int count = 0;
+            if (tmTask != null) {
+                // 去查询任务分单表
+                List<LeaseApplyInfo> collect = tmTaskMapper.getAuditManageListByLeaseInfo(tmTask);
+                int deptId1 = tmTaskMapper.getDeptId(collect.get(0).getCreateBy());
+                //施管部只能看到机具分公司（101）的数据
+                if (deptId == 101) {
+                    List<LeaseApplyInfo> auditListByLeaseInfo = collect.stream().filter(t -> t.getCompanyId() != null).filter(t -> t.getCompanyId() == 101).collect(Collectors.toList());
+                    if (deptId1 == 101) {
+                        List<LeaseApplyInfo> applyInfoList = collect.stream().filter(t -> t.getCompanyId() != null).filter(t -> t.getCompanyId() == 102).collect(Collectors.toList());
+                        auditListByLeaseInfo.addAll(applyInfoList);
+                    }
+                    if (auditListByLeaseInfo != null && !auditListByLeaseInfo.isEmpty()) {
+                        // 对领料任务集合查询具体详情
+                        for (LeaseApplyInfo leaseApplyInfo : auditListByLeaseInfo) {
+                            if (leaseApplyInfo != null) {
+                                // 去查询领料任务详情表
+                                List<LeaseApplyDetails> leaseApplyDetails = tmTaskMapper.getLeaseApplyManageDetails(leaseApplyInfo);
+                                if (leaseApplyDetails.size() > 0) {
+                                    for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) {
+                                        if (leaseApplyDetail != null && leaseApplyDetail.getPreNum() != null) {
+                                            // 统计预领数量
+                                            count += leaseApplyDetail.getPreNum();
+                                        }
+                                    }
+                                    // 塞入领料任务详情的集合中
+                                    leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
+                                    // 存入领料任务实体集合
+                                    tmTask.setLeaseApplyInfoList(auditListByLeaseInfo);
+                                    tmTask.setRemark(collect.get(0).getRemark());
+                                }
+                            }
+                        }
+                    }
+                }
+                if (deptId == 102) {
+                    List<LeaseApplyInfo> auditListByLeaseInfo = collect.stream().filter(t -> t.getCompanyId() != null).filter(t -> t.getCompanyId() == 102).collect(Collectors.toList());
+                    if (deptId1 == 102) {
+                        List<LeaseApplyInfo> list2 = collect.stream().filter(t -> t.getCompanyId() != null).filter(t -> t.getCompanyId() == 101).collect(Collectors.toList());
+                        auditListByLeaseInfo.addAll(list2);
+                    }
+                    if (auditListByLeaseInfo != null && !auditListByLeaseInfo.isEmpty()) {
+                        // 对领料任务集合查询具体详情
+                        for (LeaseApplyInfo leaseApplyInfo : auditListByLeaseInfo) {
+                            if (leaseApplyInfo != null) {
+                                // 去查询领料任务详情表
+                                List<LeaseApplyDetails> leaseApplyDetails = tmTaskMapper.getLeaseApplyManageDetails(leaseApplyInfo);
+                                if (leaseApplyDetails.size() > 0) {
+                                    for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) {
+                                        if (leaseApplyDetail != null && leaseApplyDetail.getPreNum() != null) {
+                                            // 统计预领数量
+                                            count += leaseApplyDetail.getPreNum();
+                                        }
+                                    }
+                                    // 塞入领料任务详情的集合中
+                                    leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
+                                    // 存入领料任务实体集合
+                                    tmTask.setLeaseApplyInfoList(auditListByLeaseInfo);
+                                    tmTask.setRemark(collect.get(0).getRemark());
+                                }
+                            }
+                        }
+                    }
+                }
+                //只能查詢改部門下的數據
+                if (deptId == deptId1) {
                     // 对领料任务集合查询具体详情
                     for (LeaseApplyInfo leaseApplyInfo : collect) {
                         if (leaseApplyInfo != null) {
@@ -646,34 +708,50 @@ public class TmTaskServiceImpl implements TmTaskService {
                         }
                     }
                 }
-                // 塞入预领的合计数量
-                tmTask.setPreCountNum(count);
             }
+            tmTask.setPreCountNum(count);
+        }
 
-        } else {
-            for (TmTask tmTask : tmTaskList) {
-                collect = tmTaskMapper.getAuditManageListByLeaseInfo(tmTask);
-                for (LeaseApplyInfo leaseApplyInfo : collect) {
-                    String createBy = leaseApplyInfo.getCreateBy();
-                    // 查询当前领料人所属部门
-                    int deptId1 = tmTaskMapper.getDeptId(createBy);
-                    if ((deptId == 101 && leaseApplyInfo.getCompanyId() == 101) || (deptId1 == deptId && deptId1 == 101)) {
-                        leaseApplyInfoList.add(leaseApplyInfo);
+        for (TmTask tmTask : list) {
+            int count = 0;
+            if (tmTask != null) {
+                // 去查询任务分单表
+                List<LeaseApplyInfo> collect = tmTaskMapper.getAuditManageListByLeaseInfo(tmTask);
+                int deptId1 = tmTaskMapper.getDeptId(collect.get(0).getCreateBy());
+                if (roles.contains("sgb")) {
+                    // 对领料任务集合查询具体详情
+                    List<LeaseApplyInfo> auditListByLeaseInfo = collect.stream().filter(t -> t.getCompanyId() != null).filter(t -> t.getCompanyId() == 101).collect(Collectors.toList());
+                    if (deptId1 == 210) {
+                        List<LeaseApplyInfo> list1 = collect.stream().filter(t -> t.getCompanyId() != null).filter(t -> t.getCompanyId() == 102).collect(Collectors.toList());
+                        auditListByLeaseInfo.addAll(list1);
                     }
-                    if ((deptId == 102 && leaseApplyInfo.getCompanyId() == 102) || (deptId1 == deptId && deptId1 == 102)) {
-                        leaseApplyInfoList.add(leaseApplyInfo);
-                    }
-                    if ((roles.contains("sgb") && leaseApplyInfo.getCompanyId() == 101) || (deptId1 == 210)) {
-                        leaseApplyInfoList.add(leaseApplyInfo);
-                    }
-                    if (roles.contains("fgs") && (deptId == deptId1)) {
-                        leaseApplyInfoList.add(leaseApplyInfo);
+                    if (auditListByLeaseInfo != null && !auditListByLeaseInfo.isEmpty()) {
+                        // 对领料任务集合查询具体详情
+                        for (LeaseApplyInfo leaseApplyInfo : auditListByLeaseInfo) {
+                            if (leaseApplyInfo != null) {
+                                // 去查询领料任务详情表
+                                List<LeaseApplyDetails> leaseApplyDetails = tmTaskMapper.getLeaseApplyManageDetails(leaseApplyInfo);
+                                if (leaseApplyDetails.size() > 0) {
+                                    for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) {
+                                        if (leaseApplyDetail != null && leaseApplyDetail.getPreNum() != null) {
+                                            // 统计预领数量
+                                            count += leaseApplyDetail.getPreNum();
+                                        }
+                                    }
+                                    // 塞入领料任务详情的集合中
+                                    leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
+                                    // 存入领料任务实体集合
+                                    tmTask.setLeaseApplyInfoList(auditListByLeaseInfo);
+                                    tmTask.setRemark(collect.get(0).getRemark());
+                                }
+                            }
+                        }
                     }
                 }
 
-                if (leaseApplyInfoList != null && !leaseApplyInfoList.isEmpty()) {
+                if (roles.contains("admin")) {
                     // 对领料任务集合查询具体详情
-                    for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) {
+                    for (LeaseApplyInfo leaseApplyInfo : collect) {
                         if (leaseApplyInfo != null) {
                             // 去查询领料任务详情表
                             List<LeaseApplyDetails> leaseApplyDetails = tmTaskMapper.getLeaseApplyManageDetails(leaseApplyInfo);
@@ -687,15 +765,14 @@ public class TmTaskServiceImpl implements TmTaskService {
                                 // 塞入领料任务详情的集合中
                                 leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails);
                                 // 存入领料任务实体集合
-                                tmTask.setLeaseApplyInfoList(leaseApplyInfoList);
-                                tmTask.setRemark(leaseApplyInfoList.get(0).getRemark());
+                                tmTask.setLeaseApplyInfoList(collect);
+                                tmTask.setRemark(collect.get(0).getRemark());
                             }
                         }
                     }
                 }
-                // 塞入预领的合计数量
-                tmTask.setPreCountNum(count);
             }
+            tmTask.setPreCountNum(count);
         }
         List<TmTask> tmTasks = tmTaskList.stream().filter(t -> t.getLeaseApplyInfoList() != null).collect(Collectors.toList());
         return tmTasks;