|
@@ -512,6 +512,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
|
|
|
deptIds.add(-1);
|
|
|
List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().in(User::getDepartmentId, deptIds));
|
|
|
List<String> userIds = userList.stream().map(User::getId).distinct().collect(Collectors.toList());
|
|
|
+ userIds.add("-1");
|
|
|
customLambdaQueryWrapper.in(Custom::getCreatorId,userIds);
|
|
|
contactsLambdaQueryWrapper.in(Contacts::getCreatorId,userIds);
|
|
|
businessOpportunityLambdaQueryWrapper.in(BusinessOpportunity::getCreatorId,userIds);
|
|
@@ -529,6 +530,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
|
|
|
Integer targetDeptId = user.getDepartmentId();
|
|
|
List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getDepartmentId, targetDeptId));
|
|
|
List<String> targetUserIds = users.stream().map(User::getId).distinct().collect(Collectors.toList());
|
|
|
+ targetUserIds.add("-1");
|
|
|
customLambdaQueryWrapper.in(Custom::getCreatorId,targetUserIds);
|
|
|
contactsLambdaQueryWrapper.in(Contacts::getCreatorId,targetUserIds);
|
|
|
businessOpportunityLambdaQueryWrapper.in(BusinessOpportunity::getCreatorId,targetUserIds);
|
|
@@ -547,6 +549,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
|
|
|
List<Integer> branchDepartment = getBranchDepartment(targetDeptId1, allDeptList);
|
|
|
List<User> users1 = userMapper.selectList(new LambdaQueryWrapper<User>().in(User::getDepartmentId, branchDepartment));
|
|
|
List<String> targetUserIds1 = users1.stream().map(User::getId).distinct().collect(Collectors.toList());
|
|
|
+ targetUserIds1.add("-1");
|
|
|
customLambdaQueryWrapper.in(Custom::getCreatorId,targetUserIds1);
|
|
|
contactsLambdaQueryWrapper.in(Contacts::getCreatorId,targetUserIds1);
|
|
|
businessOpportunityLambdaQueryWrapper.in(BusinessOpportunity::getCreatorId,targetUserIds1);
|