Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/SalesOrderServiceImpl.java

@@ -1250,6 +1250,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
                     List<Integer> deptIds = departmentList.stream().map(Department::getDepartmentId).distinct().collect(Collectors.toList());
                     deptIds.add(-1);
                     List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().in(User::getDepartmentId, deptIds));
+                    userList.add(user);
                     List<String> userIds = userList.stream().map(User::getId).distinct().collect(Collectors.toList());
                     targetUserIds=userIds;
                     break;
@@ -1257,6 +1258,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
                     //本部门
                     Integer targetDeptId1 = user.getDepartmentId();
                     List<User> users1 = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getDepartmentId, targetDeptId1));
+                    users1.add(user);
                     List<String> targetUserIds1 = users1.stream().map(User::getId).distinct().collect(Collectors.toList());
                     targetUserIds=targetUserIds1;
                     break;
@@ -1264,6 +1266,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
                     Integer targetDeptId2 = user.getDepartmentId();
                     List<Integer> branchDepartment = getBranchDepartment(targetDeptId2, allDeptList);
                     List<User> users2 = userMapper.selectList(new LambdaQueryWrapper<User>().in(User::getDepartmentId, branchDepartment));
+                    users2.add(user);
                     List<String> targetUserIds2 = users2.stream().map(User::getId).distinct().collect(Collectors.toList());
                     targetUserIds=targetUserIds2;
             }