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 68ce334b..505f1e27 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 @@ -618,12 +618,15 @@ public class TmTaskServiceImpl implements TmTaskService { public List getLeaseAuditManageList(TmTask record) { Set roles = SecurityUtils.getLoginUser().getRoles(); Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); - if (roles.contains("fgs")) { + List tmTaskList = new ArrayList<>(); + if (roles.contains("fgs") && roles.contains("sgb")) { + record.setCompanyId(101); + tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); + } else if (roles.contains("fgs")) { record.setDeptId(deptId); + tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); } - List tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); - for (TmTask tmTask : tmTaskList) { int count = 0; if (tmTask != null) { @@ -651,6 +654,11 @@ 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 135e74c5..30212702 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 @@ -561,6 +561,9 @@ AND su.dept_id = #{record.deptId} + + AND lai.company_id = #{record.companyId} + AND tt.task_id = #{record.taskId}