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 57f50b38..68ce334b 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
@@ -651,11 +651,6 @@ public class TmTaskServiceImpl implements TmTaskService {
}
}
}
- // 存入领料任务实体集合
- tmTask.setLeaseApplyInfoList(collect);
- if (collect.size() > 0) {
- tmTask.setRemark(collect.get(0).getRemark());
- }
}
//施管部只能看到机具分公司(101)的数据
if (roles.contains("jjfgs") || roles.contains("sgb") || deptId == 101) {
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
index 5798f2db..135e74c5 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -940,7 +940,7 @@
AND tt.create_by = #{record.createBy}
- AND lai.company_id = #{record.companyId}
+ AND lai.company_id = #{record.companyId} or su.dept_id = #{record.companyId}
AND tt.task_id = #{record.taskId}