bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

This commit is contained in:
BianLzhaoMin 2024-05-27 16:33:17 +08:00
parent c0ac8806c8 3e93e0ff4b
commit 6b4e876aee
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -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) {

2
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -940,7 +940,7 @@
AND tt.create_by = #{record.createBy}
</if>
<if test="record.companyId != null and record.companyId != '' ">
AND lai.company_id = #{record.companyId}
AND lai.company_id = #{record.companyId} or su.dept_id = #{record.companyId}
</if>
<if test="record.taskId != null and record.taskId != '' ">
AND tt.task_id = #{record.taskId}