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

领料管理列表展示问题提交

This commit is contained in:
liang.chao 2024-05-10 11:06:49 +08:00
parent 54d057f5b2
commit ecdacc0143
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -656,13 +656,13 @@ public class TmTaskServiceImpl implements TmTaskService {
} }
// 存入领料任务实体集合 // 存入领料任务实体集合
tmTask.setLeaseApplyInfoList(collect); tmTask.setLeaseApplyInfoList(collect);
if(collect.size()>0){ if (collect.size() > 0) {
tmTask.setRemark(collect.get(0).getRemark()); tmTask.setRemark(collect.get(0).getRemark());
} }
} }
//施管部只能看到机具分公司（101）的数据 //施管部只能看到机具分公司（101）的数据
if ((companyId != null && companyId == 101) || ((roles.contains("jjfgs") || roles.contains("sgb")) && companyId != null)) { if ((roles.contains("jjfgs") || roles.contains("sgb")) && companyId != null) {
List<LeaseApplyInfo> auditListByLeaseInfo = collect.stream().filter(t -> t.getCompanyId() == companyId.intValue()).collect(Collectors.toList()); List<LeaseApplyInfo> auditListByLeaseInfo = collect.stream().filter(t -> t.getCompanyId() != null).filter(t -> t.getCompanyId() == companyId.intValue()).collect(Collectors.toList());
if (auditListByLeaseInfo != null && !auditListByLeaseInfo.isEmpty()) { if (auditListByLeaseInfo != null && !auditListByLeaseInfo.isEmpty()) {
// 对领料任务集合查询具体详情 // 对领料任务集合查询具体详情
for (LeaseApplyInfo leaseApplyInfo : auditListByLeaseInfo) { for (LeaseApplyInfo leaseApplyInfo : auditListByLeaseInfo) {
@ -688,7 +688,7 @@ public class TmTaskServiceImpl implements TmTaskService {
} }
//安监部只能看到设备分公司（102）的数据 //安监部只能看到设备分公司（102）的数据
if ((roles.contains("tsfgs") || roles.contains("ajb")) && companyId != null) { if ((roles.contains("tsfgs") || roles.contains("ajb")) && companyId != null) {
List<LeaseApplyInfo> auditListByLeaseInfo = collect.stream().filter(t -> t.getCompanyId() == companyId.intValue()).collect(Collectors.toList()); List<LeaseApplyInfo> auditListByLeaseInfo = collect.stream().filter(t -> t.getCompanyId() != null).filter(t -> t.getCompanyId() == companyId.intValue()).collect(Collectors.toList());
if (auditListByLeaseInfo != null && !auditListByLeaseInfo.isEmpty()) { if (auditListByLeaseInfo != null && !auditListByLeaseInfo.isEmpty()) {
// 对领料任务集合查询具体详情 // 对领料任务集合查询具体详情
for (LeaseApplyInfo leaseApplyInfo : auditListByLeaseInfo) { for (LeaseApplyInfo leaseApplyInfo : auditListByLeaseInfo) {