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

测试问题项修改

This commit is contained in:
csyue 2024-05-29 12:44:54 +08:00
parent 12a3cc8887
commit 88dc90fa49
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -616,7 +616,9 @@ public class TmTaskServiceImpl implements TmTaskService {
Set<String> roles = SecurityUtils.getLoginUser().getRoles();
Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
List<TmTask> list = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
record.setDeptId(deptId);
if (deptId == 101 || deptId == 102) {
record.setCompanyId(deptId.intValue());
}
List<TmTask> tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
@ -628,12 +630,11 @@ public class TmTaskServiceImpl implements TmTaskService {
if (collect.size() > 0) {
int deptId1 = tmTaskMapper.getDeptId(collect.get(0).getCreateBy());
//机具经理、书记、副经理查看数据
if (deptId == 101) {
if (deptId == 101 && deptId1 == 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) {
@ -658,12 +659,11 @@ public class TmTaskServiceImpl implements TmTaskService {
}
}
// 调试公司可以看到的数据权限
if (deptId == 102) {
if (deptId == 102 && deptId1 == 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) {